]> source.dussan.org Git - nextcloud-server.git/commitdiff
Merge branch 'master' of git://anongit.kde.org/owncloud
authorCôme BERNIGAUD <come.bernigaud@laposte.net>
Thu, 25 Aug 2011 20:44:05 +0000 (22:44 +0200)
committerCôme BERNIGAUD <come.bernigaud@laposte.net>
Thu, 25 Aug 2011 20:44:05 +0000 (22:44 +0200)

Trivial merge