Merge branch 'killnitc' old branch renamed as 'oldnitc'
authorJean Privat <jean@pryen.org>
Thu, 16 Jan 2014 18:47:48 +0000 (13:47 -0500)
committerJean Privat <jean@pryen.org>
Thu, 16 Jan 2014 18:47:48 +0000 (13:47 -0500)

Trivial merge