From: Sam Tuke <sam@donttravelempty.com>
Date: Thu, 26 Apr 2012 17:45:59 +0000 (+0100)
Subject: Merge branch 'master' of gitorious.org:owncloud/owncloud
X-Git-Tag: v4.0.0beta~175
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=d96e962fc1f5df7efec5266d34735ebcdc20b056;p=nextcloud-server.git

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

d96e962fc1f5df7efec5266d34735ebcdc20b056