From: Thomas Müller <thomas.mueller@tmit.eu>
Date: Wed, 30 Oct 2013 21:11:19 +0000 (+0100)
Subject: Merge branch 'master' into home-storage
X-Git-Tag: v6.0.0beta3~29^2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=261cd87efa5623b51bbfa466f94d243bb7b49336;p=nextcloud-server.git

Merge branch 'master' into home-storage
---

261cd87efa5623b51bbfa466f94d243bb7b49336