]> source.dussan.org Git - nextcloud-server.git/commitdiff
Merge commit 'refs/merge-requests/54' of git://gitorious.org/owncloud/owncloud into...
authorMarvin Thomas Rabe <m.rabe@echtzeitraum.de>
Thu, 6 Oct 2011 20:35:36 +0000 (22:35 +0200)
committerMarvin Thomas Rabe <m.rabe@echtzeitraum.de>
Thu, 6 Oct 2011 20:35:36 +0000 (22:35 +0200)

Trivial merge