From: Thomas Tanghus <thomas@tanghus.net>
Date: Fri, 16 Dec 2011 16:43:06 +0000 (+0100)
Subject: Merge git://gitorious.org/owncloud/owncloud into tanghus_remote_backup
X-Git-Tag: v3.0~79^2~1^2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=f3e8776dc63656d99c39c007c230a80c0c9e384b;p=nextcloud-server.git

Merge git://gitorious.org/owncloud/owncloud into tanghus_remote_backup
---

f3e8776dc63656d99c39c007c230a80c0c9e384b