From: Florin Peter <github@florin-peter.de>
Date: Wed, 29 May 2013 18:29:09 +0000 (+0200)
Subject: Merge branch 'master' into remove_unused_vars
X-Git-Tag: v6.0.0alpha2~712^2~2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=8c6eec7a8fa0036ad59af535a6cbead791671305;p=nextcloud-server.git

Merge branch 'master' into remove_unused_vars
---

8c6eec7a8fa0036ad59af535a6cbead791671305