From: Tom Needham <needham.thomas@gmail.com>
Date: Sun, 15 Apr 2012 15:09:54 +0000 (+0000)
Subject: Merge branch 'master' of gitorious.org:owncloud/owncloud
X-Git-Tag: v4.0.0beta~291
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=b0e68d039c17c26013460f890c148595652b5376;p=nextcloud-server.git

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

b0e68d039c17c26013460f890c148595652b5376