From: David A. Velasco <dvelasco@solidgear.es>
Date: Mon, 2 Feb 2015 12:48:30 +0000 (+0100)
Subject: Merge branch 'develop' into imageGrid
X-Git-Tag: oc-android-1.7.0_signed~16^2~1
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/4af15f7b4ed255f8ccc378e9cf2e47280868129d?hp=4af15f7b4ed255f8ccc378e9cf2e47280868129d

Merge branch 'develop' into imageGrid
---