]> source.dussan.org Git - nextcloud-server.git/commitdiff
Merge branch 'master' of gitorious.org:owncloud/owncloud
authorMarvin Thomas Rabe <m.rabe@echtzeitraum.de>
Tue, 4 Oct 2011 17:37:54 +0000 (19:37 +0200)
committerMarvin Thomas Rabe <m.rabe@echtzeitraum.de>
Tue, 4 Oct 2011 17:37:54 +0000 (19:37 +0200)

Trivial merge