]> source.dussan.org Git - nextcloud-server.git/commitdiff
Merge branch 'master' of gitorious.org:owncloud/owncloud
authorGeorg Ehrke <georg.stefan.germany@googlemail.com>
Tue, 4 Oct 2011 08:17:55 +0000 (10:17 +0200)
committerGeorg Ehrke <georg.stefan.germany@googlemail.com>
Tue, 4 Oct 2011 08:17:55 +0000 (10:17 +0200)

Trivial merge