]> source.dussan.org Git - nextcloud-server.git/commitdiff
Merge branch 'master' of gitorious.org:owncloud/owncloud
authorFrank Karlitschek <karlitschek@kde.org>
Sat, 21 Apr 2012 20:50:30 +0000 (22:50 +0200)
committerFrank Karlitschek <karlitschek@kde.org>
Sat, 21 Apr 2012 20:50:30 +0000 (22:50 +0200)

Trivial merge