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

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