From: Björn Schießle <schiessle@owncloud.com>
Date: Mon, 1 Jul 2013 08:48:58 +0000 (+0200)
Subject: Merge branch 'master' of github.com:owncloud/core
X-Git-Tag: v6.0.0alpha2~549
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=7b0e3e6;p=nextcloud-server.git

Merge branch 'master' of github.com:owncloud/core
---

7b0e3e6303c50648950786c5310089b8a5911c21