From: Marvin Thomas Rabe <m.rabe@echtzeitraum.de>
Date: Sun, 2 Oct 2011 13:38:51 +0000 (+0200)
Subject: Merge branch 'master' of git://gitorious.org/owncloud/owncloud
X-Git-Tag: v3.0~123^2~13
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=ba49bcd5a912d6b70e408d8216a178bcaf554a7a;p=nextcloud-server.git

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

ba49bcd5a912d6b70e408d8216a178bcaf554a7a