]> source.dussan.org Git - nextcloud-server.git/commitdiff
Merge branch 'master' of gitorious.org:owncloud/owncloud
authorFrank Karlitschek <karlitschek@kde.org>
Fri, 6 Jan 2012 18:15:29 +0000 (19:15 +0100)
committerFrank Karlitschek <karlitschek@kde.org>
Fri, 6 Jan 2012 18:15:29 +0000 (19:15 +0100)

Trivial merge