From: tobiasKaminsky <tobias@kaminsky.me>
Date: Wed, 1 Jul 2015 17:16:42 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/develop' into resizedImages
X-Git-Tag: beta-20151122~1^2~9
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/ce35d6448e39f06d66596b23dc7e3ddf1e93ab5a?hp=ce35d6448e39f06d66596b23dc7e3ddf1e93ab5a

Merge remote-tracking branch 'upstream/develop' into resizedImages
---