merge branch 'nitlight'
authorJean Privat <jean@pryen.org>
Thu, 22 Aug 2013 17:42:49 +0000 (13:42 -0400)
committerJean Privat <jean@pryen.org>
Thu, 22 Aug 2013 17:42:49 +0000 (13:42 -0400)
commit248e3078b94db6eb5b88aab9f4efc7792ec81c09
tree5fe286822e9e6318d974a3ec8648b3c976971f7d
parent0ef8176c7763aa804c1bd6eb726089f1381e5c5d
parent4f2fa469f2e658c94aaee1e6f46574c5180b37b7
merge branch 'nitlight'

Conflicts:
tests/sav/nitlight_args1.res
tests/testfull.sh