From: tobiasKaminsky <tobias@kaminsky.me>
Date: Thu, 29 Oct 2015 16:55:56 +0000 (+0100)
Subject: Merge branch 'switchListVsGridMaster' into beta
X-Git-Tag: beta-20151122~94
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/e8654191a721c6d5831992645f2c4f38a7ca35b7?hp=--cc

Merge branch 'switchListVsGridMaster' into beta
---

e8654191a721c6d5831992645f2c4f38a7ca35b7