From: Georg Ehrke <georg.stefan.germany@googlemail.com>
Date: Thu, 6 Oct 2011 11:21:38 +0000 (+0200)
Subject: Merge branch 'master' of gitorious.org:owncloud/owncloud
X-Git-Tag: v3.0~95^2~16
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=bf017fb4bdae355675d5b81755ed0c738cf58d2e;p=nextcloud-server.git

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

bf017fb4bdae355675d5b81755ed0c738cf58d2e