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