]> source.dussan.org Git - nextcloud-server.git/commitdiff
Merge branch 'master' of git://anongit.kde.org/owncloud
authorMichael Gapczynski <GapczynskiM@gmail.com>
Sun, 10 Jul 2011 20:00:31 +0000 (16:00 -0400)
committerMichael Gapczynski <GapczynskiM@gmail.com>
Sun, 10 Jul 2011 20:00:31 +0000 (16:00 -0400)

Trivial merge