From: Thomas Müller <thomas.mueller@tmit.eu>
Date: Tue, 30 Jul 2013 15:20:15 +0000 (+0200)
Subject: Merge branch 'stable5' into backport-remember-checked
X-Git-Tag: v5.0.10~16^2~1^2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=c34f4c829882459976d7adfcbcfdc78232c9c9e9;p=nextcloud-server.git

Merge branch 'stable5' into backport-remember-checked
---

c34f4c829882459976d7adfcbcfdc78232c9c9e9