]> source.dussan.org Git - nextcloud-server.git/commitdiff
Merge branch 'master' of gitorious.org:owncloud/owncloud
authorGeorg Ehrke <georg.stefan.germany@googlemail.com>
Wed, 28 Sep 2011 16:44:17 +0000 (18:44 +0200)
committerGeorg Ehrke <georg.stefan.germany@googlemail.com>
Wed, 28 Sep 2011 16:44:17 +0000 (18:44 +0200)

Trivial merge