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

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

a2bcbec791b7cd81e5a1d734691f9cff63d114e2