From: tobiasKaminsky <tobias@kaminsky.me>
Date: Sat, 31 Oct 2015 07:36:39 +0000 (+0100)
Subject: Merge remote-tracking branch 'remotes/upstream/resizedImages' into beta
X-Git-Tag: beta-20151122~68
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/8dfc1622bd406869a635d0e85c1c82ee1bb9ca18?hp=8dfc1622bd406869a635d0e85c1c82ee1bb9ca18

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