From: Tom Needham <needham.thomas@gmail.com>
Date: Mon, 2 Apr 2012 17:44:24 +0000 (+0000)
Subject: Merge branch 'master' of gitorious.org:owncloud/owncloud
X-Git-Tag: v4.0.0beta~381^2~19^2~1
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=9f9b448161326ee15e0c0783efc1c5ce81adea47;p=nextcloud-server.git

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

9f9b448161326ee15e0c0783efc1c5ce81adea47