Merge branch 'nitdoc'
authorJean Privat <jean@pryen.org>
Fri, 17 Jan 2014 16:44:03 +0000 (11:44 -0500)
committerJean Privat <jean@pryen.org>
Fri, 17 Jan 2014 16:44:03 +0000 (11:44 -0500)

Trivial merge