From: Thomas Tanghus <thomas@tanghus.net>
Date: Mon, 2 Jan 2012 10:47:02 +0000 (+0100)
Subject: Merge git://gitorious.org/owncloud/owncloud into oc_image
X-Git-Tag: v3.0~64^2~6^2~8
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=29048bf4bd80e7312cfc4b46b7b56a252ecdd5fd;p=nextcloud-server.git

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

29048bf4bd80e7312cfc4b46b7b56a252ecdd5fd