]> source.dussan.org Git - nextcloud-server.git/commitdiff
Merge branch 'master' of git://anongit.kde.org/owncloud
authorMichael Gapczynski <GapczynskiM@gmail.com>
Thu, 25 Aug 2011 18:58:59 +0000 (14:58 -0400)
committerMichael Gapczynski <GapczynskiM@gmail.com>
Thu, 25 Aug 2011 18:58:59 +0000 (14:58 -0400)

Trivial merge