From: jabarros <jabarros@solidgear.es>
Date: Wed, 15 Oct 2014 10:20:49 +0000 (+0200)
Subject: Merge branch 'idn_hosts' of https://github.com/ogasser/android into idn_hosts
X-Git-Tag: oc-android-1.7.0_signed~128^2~2
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/2910b006735fc7848bd7f357458332a542871bb8?hp=2910b006735fc7848bd7f357458332a542871bb8

Merge branch 'idn_hosts' of https://github.com/ogasser/android into idn_hosts

Conflicts:
	src/com/owncloud/android/authentication/AuthenticatorActivity.java
---