]> source.dussan.org Git - nextcloud-server.git/commitdiff
Merge branch 'master' of gitorious.org:owncloud/owncloud
authorGeorg Ehrke <dev@georgswebsite.de>
Sat, 9 Jun 2012 13:40:48 +0000 (15:40 +0200)
committerGeorg Ehrke <dev@georgswebsite.de>
Sat, 9 Jun 2012 13:40:48 +0000 (15:40 +0200)

Trivial merge