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

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

3d7143c7300e9458234d51fea4100197976ba906