From: Frank Karlitschek Date: Fri, 18 May 2012 19:16:03 +0000 (+0200) Subject: Merge branch 'master' of gitorious.org:owncloud/owncloud X-Git-Tag: v4.0.0RC2^0 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=e03b5ff6653ca7334f24bf2000eacdbad4c99bf8;p=nextcloud-server.git Merge branch 'master' of gitorious.org:owncloud/owncloud --- e03b5ff6653ca7334f24bf2000eacdbad4c99bf8