]> source.dussan.org Git - nextcloud-server.git/commitdiff
Merge branch 'master' of git://anongit.kde.org/owncloud
authorJakob Sack <kde@jakobsack.de>
Sat, 6 Aug 2011 21:10:14 +0000 (23:10 +0200)
committerJakob Sack <kde@jakobsack.de>
Sat, 6 Aug 2011 21:10:14 +0000 (23:10 +0200)

Trivial merge