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

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