From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Mon, 4 Jun 2012 16:04:29 +0000 (+0200)
Subject: Merge branch 'master' of gitorious.org:owncloud/owncloud
X-Git-Tag: v4.5.0beta1~74^2~424^2~32
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=6d70f42dd432eca06cf73d5fe5f34c3bc3bb924f;p=nextcloud-server.git

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

6d70f42dd432eca06cf73d5fe5f34c3bc3bb924f