]> source.dussan.org Git - nextcloud-server.git/commitdiff
Merge branch 'master' of git://anongit.kde.org/owncloud
authorKamil Domanski <kdomanski@kdemail.net>
Fri, 24 Jun 2011 14:05:48 +0000 (16:05 +0200)
committerKamil Domanski <kdomanski@kdemail.net>
Fri, 24 Jun 2011 14:05:48 +0000 (16:05 +0200)

Trivial merge