From: Frank Karlitschek <frank@owncloud.org>
Date: Tue, 1 May 2012 18:07:36 +0000 (+0200)
Subject: Merge branch 'master' of gitorious.org:owncloud/owncloud
X-Git-Tag: v4.0.0beta~117
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=ab584719049965f78d244879ce2a400a1955eec6;p=nextcloud-server.git

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

ab584719049965f78d244879ce2a400a1955eec6