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

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

e6384251ebf4527b0516029c225a8891fced74cc