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)
commit074da8af18be5949d8b50863a5fa3196fecc1b53
treee4e91b28e43bea6ff2a4abb65922732ca5c093f7
parent93db2417b6b0fac3a3970dffed7d1cc44b7a87b4
parent16f618f07f82e2b136c10736b4bf9c6207f60bdb
Merge remote-tracking branch 'alexandre/nitdoc-qs'