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

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

ec12dec10688490b7ecdce3d305f1436cdf59675