From: jabarros <jabarros@solidgear.es>
Date: Tue, 20 Jan 2015 08:56:45 +0000 (+0100)
Subject: Merge branch 'develop' into imageGrid
X-Git-Tag: oc-android-1.7.0_signed~16^2~16
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/451783be22d81eb792e5a0ff77a91f7b5d102c91?hp=-c

Merge branch 'develop' into imageGrid
---

451783be22d81eb792e5a0ff77a91f7b5d102c91