From: Thomas Tanghus Date: Sun, 11 Dec 2011 15:29:53 +0000 (+0100) Subject: Merge git://gitorious.org/owncloud/owncloud into tanghus_remote_backup X-Git-Tag: v3.0~79^2~1^2~5 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=39430c837fbb7f2626a557a90c445d030befae9b;p=nextcloud-server.git Merge git://gitorious.org/owncloud/owncloud into tanghus_remote_backup --- 39430c837fbb7f2626a557a90c445d030befae9b