From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Mon, 18 Jun 2012 13:38:24 +0000 (+0200)
Subject: Merge branch 'master' of gitorious.org:owncloud/owncloud
X-Git-Tag: v4.5.0beta1~74^2~411^2~5
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=405ac36e0c34ec03fc00eab1ee57520c34cd7d28;p=nextcloud-server.git

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

405ac36e0c34ec03fc00eab1ee57520c34cd7d28