From: Frank Karlitschek Date: Fri, 1 Jun 2012 14:35:14 +0000 (+0200) Subject: Merge branch 'master' of gitorious.org:owncloud/owncloud X-Git-Tag: v4.5.0beta1~74^2~425^2~11 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=1395e411f464aa717c26c6e2be142e7ecaef8d50;p=nextcloud-server.git Merge branch 'master' of gitorious.org:owncloud/owncloud --- 1395e411f464aa717c26c6e2be142e7ecaef8d50