From: jabarros <jabarros@solidgear.es>
Date: Thu, 23 Oct 2014 09:20:09 +0000 (+0200)
Subject: Merge branch 'develop' into idn_hosts
X-Git-Tag: oc-android-1.7.0_signed~128^2~1
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/69320c88057be535f9d756247bcd4fb72b53857d

Merge branch 'develop' into idn_hosts
---

69320c88057be535f9d756247bcd4fb72b53857d