From: jabarros <jabarros@solidgear.es>
Date: Tue, 8 Jul 2014 11:03:09 +0000 (+0200)
Subject: Merge branch 'develop' into release-1.5.8
X-Git-Tag: oc-android-1.7.0_signed~125^2~13
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/96e2d198e0129bc698561148eb45cf0422ebf4f2?hp=--cc

Merge branch 'develop' into release-1.5.8
---

96e2d198e0129bc698561148eb45cf0422ebf4f2