]> source.dussan.org Git - nextcloud-server.git/commitdiff
Merge branch 'master' of gitorious.org:owncloud/owncloud
authorFrank Karlitschek <karlitschek@kde.org>
Sat, 22 Oct 2011 17:41:18 +0000 (19:41 +0200)
committerFrank Karlitschek <karlitschek@kde.org>
Sat, 22 Oct 2011 17:41:18 +0000 (19:41 +0200)

Trivial merge