]> source.dussan.org Git - nextcloud-server.git/commitdiff
Merge branch 'master' of git.kde.org:owncloud
authorCôme BERNIGAUD <come.bernigaud@laposte.net>
Sat, 27 Aug 2011 16:11:32 +0000 (18:11 +0200)
committerCôme BERNIGAUD <come.bernigaud@laposte.net>
Sat, 27 Aug 2011 16:11:32 +0000 (18:11 +0200)

Trivial merge