Merge remote-tracking branch 'alexandre/nitdoc-qs'
authorJean Privat <jean@pryen.org>
Thu, 16 Jan 2014 19:50:01 +0000 (14:50 -0500)
committerJean Privat <jean@pryen.org>
Thu, 16 Jan 2014 19:50:01 +0000 (14:50 -0500)

Trivial merge