From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Thu, 14 Jun 2012 11:44:42 +0000 (+0200)
Subject: Merge branch 'master' of gitorious.org:owncloud/owncloud
X-Git-Tag: v4.5.0beta1~74^2~420^2~31
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=87855f2506d6ef3a36b5b574966c8373ab9d4b92;p=nextcloud-server.git

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

87855f2506d6ef3a36b5b574966c8373ab9d4b92