From: Sam Tuke <samtuke@owncloud.com>
Date: Fri, 1 Jun 2012 18:00:28 +0000 (+0100)
Subject: Merge branch 'master' of gitorious.org:owncloud/owncloud
X-Git-Tag: v4.5.0beta1~74^2~425^2~6
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=2ccf3da41168f843a5895913f0c1ef41a0cb04b7;p=nextcloud-server.git

Merge branch 'master' of gitorious.org:owncloud/owncloud
---

2ccf3da41168f843a5895913f0c1ef41a0cb04b7