]> source.dussan.org Git - nextcloud-server.git/commitdiff
Merge branch 'master' of git://anongit.kde.org/owncloud
authorHans Bakker <hansmbakker@gmail.com>
Wed, 17 Aug 2011 10:51:51 +0000 (12:51 +0200)
committerHans Bakker <hansmbakker@gmail.com>
Wed, 17 Aug 2011 10:51:51 +0000 (12:51 +0200)

Trivial merge