]> source.dussan.org Git - nextcloud-server.git/commitdiff
Merge branch 'master' of gitorious.org:owncloud/owncloud
authorFrank Karlitschek <karlitschek@kde.org>
Tue, 14 Feb 2012 15:34:33 +0000 (16:34 +0100)
committerFrank Karlitschek <karlitschek@kde.org>
Tue, 14 Feb 2012 15:34:33 +0000 (16:34 +0100)

Trivial merge