From: tobiasKaminsky <tobias@kaminsky.me>
Date: Mon, 26 Oct 2015 21:49:00 +0000 (+0100)
Subject: Merge remote-tracking branch 'remotes/upstream/resizedImages' into beta
X-Git-Tag: beta-20151122~102
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/d44c785d0727b71ab696d5a6216f00cf135867c6?hp=d44c785d0727b71ab696d5a6216f00cf135867c6

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