]> source.dussan.org Git - nextcloud-server.git/commitdiff
Merge branch 'master' of gitorious.org:owncloud/owncloud
authorGeorg Ehrke <georg.stefan.germany@googlemail.com>
Thu, 6 Oct 2011 11:21:38 +0000 (13:21 +0200)
committerGeorg Ehrke <georg.stefan.germany@googlemail.com>
Thu, 6 Oct 2011 11:21:38 +0000 (13:21 +0200)

Trivial merge