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)
commitc65ba23f94eacb9db382f60dee786b1c63b770b1
treeee04f739129bf10e1f3e4d13bf7127b305ef1b70
parent806f5d7224c256b1cb3f757bf33e9181d929eba9
parent245bcbe59937650fa75173fc7ac52ae5aad317f9
Merge branch 'doc_on_collection'