From: Frank Karlitschek <frank@owncloud.org>
Date: Wed, 12 Sep 2012 10:10:57 +0000 (+0200)
Subject: Merge branch 'master' of https://github.com/owncloud/core
X-Git-Tag: v4.5.0beta3~4
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=54eae53206c9baefa50da60b2c614841eda7b156;p=nextcloud-server.git

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

54eae53206c9baefa50da60b2c614841eda7b156