]> source.dussan.org Git - nextcloud-server.git/commitdiff
Merge branch 'master' of git://gitorious.org/owncloud/owncloud
authorMarvin Thomas Rabe <m.rabe@echtzeitraum.de>
Mon, 3 Oct 2011 12:47:41 +0000 (14:47 +0200)
committerMarvin Thomas Rabe <m.rabe@echtzeitraum.de>
Mon, 3 Oct 2011 12:47:41 +0000 (14:47 +0200)

Trivial merge