From: Frank Karlitschek Date: Tue, 5 Jun 2012 10:52:44 +0000 (+0200) Subject: Merge branch 'master' of gitorious.org:owncloud/owncloud X-Git-Tag: v4.5.0beta1~74^2~424^2~27^2~3 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=80fc01388a76344082ad7a63df17b5c42c8731c8;p=nextcloud-server.git Merge branch 'master' of gitorious.org:owncloud/owncloud --- 80fc01388a76344082ad7a63df17b5c42c8731c8