Merge branch 'idn_hosts' of https://github.com/ogasser/android into idn_hosts
authorjabarros <jabarros@solidgear.es>
Wed, 15 Oct 2014 10:20:49 +0000 (12:20 +0200)
committerjabarros <jabarros@solidgear.es>
Wed, 15 Oct 2014 10:20:49 +0000 (12:20 +0200)
commit2910b006735fc7848bd7f357458332a542871bb8
tree9b4256d1f9105f3f347a2d89ee3cc0c4c27e91d1
parent1ffa6e969a7b47e3d787390dede8f131d502584c
parentb20ace9185ea9b174675b77bcc71ee04d2578cc4
Merge branch 'idn_hosts' of https://github.com/ogasser/android into idn_hosts

Conflicts:
src/com/owncloud/android/authentication/AuthenticatorActivity.java
src/com/owncloud/android/authentication/AuthenticatorActivity.java
src/com/owncloud/android/ui/activity/Preferences.java