From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Tue, 26 Jun 2012 13:48:21 +0000 (+0200)
Subject: Merge branch 'master' of gitorious.org:owncloud/owncloud
X-Git-Tag: v4.5.0beta1~74^2~49^2~161
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=7dc72a48cc15b02b8dc6a380c4edcc826b04378f;p=nextcloud-server.git

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

7dc72a48cc15b02b8dc6a380c4edcc826b04378f