]> source.dussan.org Git - nextcloud-server.git/commitdiff
Merge branch 'master' of git://anongit.kde.org/owncloud
authorJakob Sack <kde@jakobsack.de>
Sun, 19 Jun 2011 14:06:52 +0000 (16:06 +0200)
committerJakob Sack <kde@jakobsack.de>
Sun, 19 Jun 2011 14:06:52 +0000 (16:06 +0200)

Trivial merge