]> source.dussan.org Git - nextcloud-server.git/commitdiff
Merge branch 'master' of gitorious.org:owncloud/owncloud
authorGeorg Ehrke <dev@georgswebsite.de>
Mon, 13 Feb 2012 16:07:24 +0000 (17:07 +0100)
committerGeorg Ehrke <dev@georgswebsite.de>
Mon, 13 Feb 2012 16:07:24 +0000 (17:07 +0100)

Trivial merge