From: Frank Karlitschek <frank@owncloud.org>
Date: Sun, 16 Sep 2012 15:14:04 +0000 (+0200)
Subject: Merge branch 'master' of https://github.com/owncloud/core
X-Git-Tag: v4.5.0beta4~10^2~21
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=f17555285e26b692170a724b3141c7304f252c95;p=nextcloud-server.git

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

f17555285e26b692170a724b3141c7304f252c95