From: Thomas Mueller <thomas.mueller@tmit.eu>
Date: Mon, 11 Feb 2013 20:42:27 +0000 (+0100)
Subject: Merge branch 'master' into fixing-1424-master
X-Git-Tag: v5.0.0beta1~51^2~4
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=037fcde1334d7b4d2bdeaaad0a71adc692b27ff8;p=nextcloud-server.git

Merge branch 'master' into fixing-1424-master
---

037fcde1334d7b4d2bdeaaad0a71adc692b27ff8