]> source.dussan.org Git - nextcloud-server.git/commitdiff
Merge branch 'master' into multi_app_dir
authorBrice Maron <brice@bmaron.net>
Thu, 21 Jun 2012 20:19:31 +0000 (20:19 +0000)
committerBrice Maron <brice@bmaron.net>
Thu, 21 Jun 2012 20:19:31 +0000 (20:19 +0000)

Trivial merge