From: Georg Ehrke <georg.stefan.germany@googlemail.com>
Date: Tue, 4 Oct 2011 08:17:55 +0000 (+0200)
Subject: Merge branch 'master' of gitorious.org:owncloud/owncloud
X-Git-Tag: v3.0~95^2~18
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=70091ec649b463e204dd2b6225d266bd79af63a2;p=nextcloud-server.git

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

70091ec649b463e204dd2b6225d266bd79af63a2