]> source.dussan.org Git - nextcloud-server.git/commitdiff
Merge branch 'master' of git.kde.org:owncloud
authorFrank Karlitschek <karlitschek@kde.org>
Sat, 6 Aug 2011 21:31:57 +0000 (23:31 +0200)
committerFrank Karlitschek <karlitschek@kde.org>
Sat, 6 Aug 2011 21:31:57 +0000 (23:31 +0200)

Trivial merge