]> source.dussan.org Git - nextcloud-server.git/commitdiff
Merge branch 'master' of git://gitorious.org/owncloud/owncloud
authorMarvin Thomas Rabe <m.rabe@echtzeitraum.de>
Sun, 2 Oct 2011 13:38:51 +0000 (15:38 +0200)
committerMarvin Thomas Rabe <m.rabe@echtzeitraum.de>
Sun, 2 Oct 2011 13:38:51 +0000 (15:38 +0200)

Trivial merge