From: Thomas Mueller <thomas.mueller@tmit.eu>
Date: Sun, 6 Jan 2013 09:36:14 +0000 (+0100)
Subject: Merge branch 'master' into fixing-998-master
X-Git-Tag: v5.0.0alpha1~192^2~17
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=6806484c1632a6be51dfc536fd9285dfb1ad7359;p=nextcloud-server.git

Merge branch 'master' into fixing-998-master
---

6806484c1632a6be51dfc536fd9285dfb1ad7359