]> source.dussan.org Git - nextcloud-server.git/commitdiff
Merge branch 'master' of git://github.com/owncloud/core
authorBrice Maron <brice@bmaron.net>
Wed, 5 Sep 2012 16:16:36 +0000 (16:16 +0000)
committerBrice Maron <brice@bmaron.net>
Wed, 5 Sep 2012 16:16:36 +0000 (16:16 +0000)

Trivial merge