From: tobiasKaminsky <tobias@kaminsky.me>
Date: Sun, 29 Nov 2015 13:37:17 +0000 (+0100)
Subject: Merge remote-tracking branch 'remotes/upstream/resizeCache' into beta
X-Git-Tag: beta-20151129~5
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/b9f8b0941a8f3af54ad511c9c199663cccf5eced?hp=b9f8b0941a8f3af54ad511c9c199663cccf5eced

Merge remote-tracking branch 'remotes/upstream/resizeCache' into beta
---