]> source.dussan.org Git - nextcloud-server.git/commitdiff
Merge commit 'refs/merge-requests/102' of git://gitorious.org/owncloud/owncloud into...
authorFlorian Hülsmann <fh@cbix.de>
Wed, 4 Apr 2012 19:36:50 +0000 (21:36 +0200)
committerFlorian Hülsmann <fh@cbix.de>
Wed, 4 Apr 2012 19:36:50 +0000 (21:36 +0200)

Trivial merge