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

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

61c4f9b3c8377e5275b05ce318bcbc285ebfcddf