From: Thomas Tanghus <thomas@tanghus.net>
Date: Sun, 1 Jan 2012 16:48:28 +0000 (+0100)
Subject: Merge git://gitorious.org/owncloud/owncloud into oc_image
X-Git-Tag: v3.0~64^2~6^2~18
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=5d8314cfb8984a6001fbfccb47c4c75b465f0991;p=nextcloud-server.git

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

5d8314cfb8984a6001fbfccb47c4c75b465f0991