Merge branch 'doc_on_collection'
authorJean Privat <jean@pryen.org>
Thu, 20 Mar 2014 21:54:55 +0000 (17:54 -0400)
committerJean Privat <jean@pryen.org>
Thu, 20 Mar 2014 21:54:55 +0000 (17:54 -0400)

Trivial merge