From: Georg Ehrke <georg@ownCloud.com>
Date: Wed, 29 May 2013 11:24:14 +0000 (+0200)
Subject: Merge branch 'master' into oc_preview
X-Git-Tag: v6.0.0alpha2~235^2~127
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=d8008ae421850c825ae692960a26eb25ca48b986;p=nextcloud-server.git

Merge branch 'master' into oc_preview
---

d8008ae421850c825ae692960a26eb25ca48b986