]> source.dussan.org Git - nextcloud-server.git/commitdiff
Merge branch 'master' of gitorious.org:owncloud/owncloud
authorFrank Karlitschek <frank@owncloud.org>
Fri, 18 May 2012 16:25:31 +0000 (18:25 +0200)
committerFrank Karlitschek <frank@owncloud.org>
Fri, 18 May 2012 16:25:31 +0000 (18:25 +0200)

Trivial merge