From: Marvin Thomas Rabe <m.rabe@echtzeitraum.de>
Date: Thu, 6 Oct 2011 20:36:34 +0000 (+0200)
Subject: Merge commit 'refs/merge-requests/52' of git://gitorious.org/owncloud/owncloud into... 
X-Git-Tag: v3.0~101^2~2^2~2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=ae56bb63c60f825136be97ddae32cc5b9cf4b062;p=nextcloud-server.git

Merge commit 'refs/merge-requests/52' of git://gitorious.org/owncloud/owncloud into merge-requests/52
---

ae56bb63c60f825136be97ddae32cc5b9cf4b062