]> source.dussan.org Git - nextcloud-server.git/commitdiff
Merge branch 'master' of https://github.com/owncloud/core v6.0.0beta2
authorFrank Karlitschek <frank@owncloud.org>
Mon, 28 Oct 2013 18:15:36 +0000 (19:15 +0100)
committerFrank Karlitschek <frank@owncloud.org>
Mon, 28 Oct 2013 18:15:36 +0000 (19:15 +0100)

Trivial merge