From: Michiel@unhosted <michiel@unhosted.org>
Date: Mon, 12 Sep 2011 11:40:27 +0000 (+0200)
Subject: Merge branch 'master' of gitorious.org:owncloud/owncloud
X-Git-Tag: v3.0~217
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=5fda79531d5fedfd91325f11d2a3448e972cdac8;p=nextcloud-server.git

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

5fda79531d5fedfd91325f11d2a3448e972cdac8