From: Georg Ehrke <developer@georgehrke.com>
Date: Fri, 23 Aug 2013 21:10:37 +0000 (+0200)
Subject: Merge branch 'master' into oc_preview
X-Git-Tag: v6.0.0alpha2~235^2~12
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=6ffa2a28d0ae63b061e1e88ee3b12726d31c3f9d;p=nextcloud-server.git

Merge branch 'master' into oc_preview
---

6ffa2a28d0ae63b061e1e88ee3b12726d31c3f9d