From: tobiasKaminsky <tobias@kaminsky.me>
Date: Sat, 14 Nov 2015 15:33:22 +0000 (+0100)
Subject: Merge branch 'master' of github.com:owncloud/android into resizeCache
X-Git-Tag: beta-20151129~5^2~1
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/0302a62af58cd305abd35ae5a6aab8a5e68329bf?hp=0302a62af58cd305abd35ae5a6aab8a5e68329bf

Merge branch 'master' of github.com:owncloud/android into resizeCache
---