From: tobiasKaminsky <tobias@kaminsky.me>
Date: Thu, 5 Nov 2015 21:04:57 +0000 (+0100)
Subject: Merge remote-tracking branch 'remotes/upstream/master' into resizedImagesMaster
X-Git-Tag: beta-20151122~1^2~1
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/ce841a3c4f7e32d5f54972dbc8d9b950174ed2ca?hp=ce841a3c4f7e32d5f54972dbc8d9b950174ed2ca

Merge remote-tracking branch 'remotes/upstream/master' into resizedImagesMaster
---