]> source.dussan.org Git - nextcloud-server.git/commitdiff
Merge branch 'master' of gitorious.org:owncloud/owncloud
authorFlorian Hülsmann <fh@cbix.de>
Sat, 23 Jun 2012 15:01:28 +0000 (17:01 +0200)
committerFlorian Hülsmann <fh@cbix.de>
Sat, 23 Jun 2012 15:01:28 +0000 (17:01 +0200)

Trivial merge