From: Florian Hülsmann Date: Sat, 23 Jun 2012 15:01:28 +0000 (+0200) Subject: Merge branch 'master' of gitorious.org:owncloud/owncloud X-Git-Tag: v4.5.0beta1~74^2~404^2 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=7109c7ea1c64176a9b74c34cb513bafd41abca5c;p=nextcloud-server.git Merge branch 'master' of gitorious.org:owncloud/owncloud --- 7109c7ea1c64176a9b74c34cb513bafd41abca5c