From: Frank Karlitschek Date: Fri, 18 May 2012 13:56:15 +0000 (+0200) Subject: Merge branch 'master' of gitorious.org:owncloud/owncloud X-Git-Tag: v4.0.0RC2~5 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=2d3c709163ae835e34e4f84144bc91ff796baa45;p=nextcloud-server.git Merge branch 'master' of gitorious.org:owncloud/owncloud --- 2d3c709163ae835e34e4f84144bc91ff796baa45