]> source.dussan.org Git - nextcloud-server.git/commitdiff
Merge commit 'refs/merge-requests/69' of git://gitorious.org/owncloud/owncloud into...
authorBrice Maron <brice@bmaron.net>
Thu, 3 Nov 2011 23:31:35 +0000 (00:31 +0100)
committerBrice Maron <brice@bmaron.net>
Thu, 3 Nov 2011 23:31:35 +0000 (00:31 +0100)

Trivial merge