]> source.dussan.org Git - nextcloud-server.git/commitdiff
Merge branch 'master' of gitorious.org:owncloud/owncloud v4.0.0RC2
authorFrank Karlitschek <frank@owncloud.org>
Fri, 18 May 2012 19:16:03 +0000 (21:16 +0200)
committerFrank Karlitschek <frank@owncloud.org>
Fri, 18 May 2012 19:16:03 +0000 (21:16 +0200)

Trivial merge