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

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

edecc5bca3af674d3af8cd8506b5571146dc0357