Merge branch 'mmnitdoc' v0.6.1
authorJean Privat <jean@pryen.org>
Fri, 30 Aug 2013 21:07:58 +0000 (17:07 -0400)
committerJean Privat <jean@pryen.org>
Fri, 30 Aug 2013 21:07:58 +0000 (17:07 -0400)

Trivial merge