Merge remote-tracking branch 'alexandre/nitdoc'
authorJean Privat <jean@pryen.org>
Thu, 7 Nov 2013 21:49:29 +0000 (16:49 -0500)
committerJean Privat <jean@pryen.org>
Thu, 7 Nov 2013 21:49:29 +0000 (16:49 -0500)

Trivial merge