From: Frank Karlitschek <frank@owncloud.org>
Date: Mon, 7 May 2012 20:56:34 +0000 (+0200)
Subject: Merge branch 'master' of gitorious.org:owncloud/owncloud
X-Git-Tag: v4.0.0beta~1
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=10d291d6b3bf25794a8edaea6c867788b717eb15;p=nextcloud-server.git

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

10d291d6b3bf25794a8edaea6c867788b717eb15