From: tobiasKaminsky <tobias@kaminsky.me>
Date: Thu, 29 Oct 2015 16:55:13 +0000 (+0100)
Subject: Merge remote-tracking branch 'remotes/upstream/master' into switchListVsGridMaster
X-Git-Tag: beta-20151122~25^2~4
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/65f8034c3030948b0a348f7f654821b6226f6a1d?hp=65f8034c3030948b0a348f7f654821b6226f6a1d

Merge remote-tracking branch 'remotes/upstream/master' into switchListVsGridMaster
---