]> source.dussan.org Git - nextcloud-server.git/commitdiff
Merge branch 'master' of git://anongit.kde.org/owncloud
authorSerge Martin <edb@sigluy.net>
Tue, 9 Aug 2011 09:33:15 +0000 (11:33 +0200)
committerSerge Martin <edb@sigluy.net>
Tue, 9 Aug 2011 09:33:15 +0000 (11:33 +0200)

Trivial merge