]> source.dussan.org Git - nextcloud-server.git/commitdiff
Merge branch 'master' of git.kde.org:owncloud
authorRobin Appelman <icewind1991@gmail.com>
Sat, 26 Feb 2011 14:50:34 +0000 (15:50 +0100)
committerRobin Appelman <icewind1991@gmail.com>
Sat, 26 Feb 2011 14:50:34 +0000 (15:50 +0100)

Trivial merge