From: Klaas Freitag <freitag@owncloud.com>
Date: Mon, 14 May 2012 08:52:25 +0000 (+0200)
Subject: Merge branch 'master' of gitorious.org:owncloud/owncloud
X-Git-Tag: v4.0.0RC2~74
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=3514ec5947c4f7ee4545eee261c6a79e98722575;p=nextcloud-server.git

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

3514ec5947c4f7ee4545eee261c6a79e98722575