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

Merge branch 'master' into oc_preview
---

af57996d1ee66463999a33c0a80505fb6027e443