]> source.dussan.org Git - nextcloud-server.git/commitdiff
Merge branch 'master' of https://github.com/owncloud/core
authorFrank Karlitschek <frank@owncloud.org>
Sun, 16 Sep 2012 15:14:04 +0000 (17:14 +0200)
committerFrank Karlitschek <frank@owncloud.org>
Sun, 16 Sep 2012 15:14:04 +0000 (17:14 +0200)

Trivial merge