Merge remote-tracking branch 'alexandre/fix-nitdoc'
authorJean Privat <jean@pryen.org>
Mon, 3 Feb 2014 16:27:10 +0000 (11:27 -0500)
committerJean Privat <jean@pryen.org>
Mon, 3 Feb 2014 16:27:10 +0000 (11:27 -0500)

Trivial merge