]> source.dussan.org Git - nextcloud-server.git/commitdiff
Merge branch 'master' of gitorious.org:~cbix/owncloud/cbix-owncloud
authorFlorian Hülsmann <fh@cbix.de>
Mon, 2 Apr 2012 15:13:21 +0000 (17:13 +0200)
committerFlorian Hülsmann <fh@cbix.de>
Mon, 2 Apr 2012 15:13:21 +0000 (17:13 +0200)

Trivial merge