From: Georg Ehrke <georg.stefan.germany@googlemail.com>
Date: Wed, 28 Sep 2011 08:29:07 +0000 (+0200)
Subject: Merge branch 'master' of gitorious.org:owncloud/owncloud
X-Git-Tag: v3.0~101^2~63^2~2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=8e42b02a224f0f476ecd7ac306a7a9cddeba8ebf;p=nextcloud-server.git

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

8e42b02a224f0f476ecd7ac306a7a9cddeba8ebf