From: Jan-Christoph Borchardt <hey@jancborchardt.net>
Date: Thu, 15 Aug 2013 22:29:43 +0000 (+0200)
Subject: merge master into css-fixes
X-Git-Tag: v6.0.0alpha2~314^2~1
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=399adf67b0ea76c3d1f10ed19734c2e1fed8fbfe;p=nextcloud-server.git

merge master into css-fixes
---

399adf67b0ea76c3d1f10ed19734c2e1fed8fbfe