From: jabarros <jabarros@solidgear.es>
Date: Thu, 11 Dec 2014 07:51:31 +0000 (+0100)
Subject: Merge branch 'develop' into community_rotateImage
X-Git-Tag: oc-android-1.7.0_signed~81^2
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/92e8194f186d739ae6e6150b2cb526898811035e?ds=inline;hp=-c

Merge branch 'develop' into community_rotateImage
---

92e8194f186d739ae6e6150b2cb526898811035e