]> source.dussan.org Git - nextcloud-server.git/commitdiff
Merge branch 'master' of git://anongit.kde.org/owncloud
authorJakob Sack <kde@jakobsack.de>
Mon, 20 Jun 2011 20:09:21 +0000 (22:09 +0200)
committerJakob Sack <kde@jakobsack.de>
Mon, 20 Jun 2011 20:09:21 +0000 (22:09 +0200)

Trivial merge