Merge branch 'develop' into idn_hosts

author jabarros <jabarros@solidgear.es>

Thu, 23 Oct 2014 09:20:09 +0000 (11:20 +0200)

committer jabarros <jabarros@solidgear.es>

Thu, 23 Oct 2014 09:20:09 +0000 (11:20 +0200)
author jabarros <jabarros@solidgear.es>
Thu, 23 Oct 2014 09:20:09 +0000 (11:20 +0200)
committer jabarros <jabarros@solidgear.es>
Thu, 23 Oct 2014 09:20:09 +0000 (11:20 +0200)
diff --cc src/com/owncloud/android/authentication/AuthenticatorActivity.java
Simple merge
diff --cc src/com/owncloud/android/ui/activity/Preferences.java
Simple merge
author	jabarros <jabarros@solidgear.es>
	Thu, 23 Oct 2014 09:20:09 +0000 (11:20 +0200)
committer	jabarros <jabarros@solidgear.es>
	Thu, 23 Oct 2014 09:20:09 +0000 (11:20 +0200)
		1	2
src/com/owncloud/android/authentication/AuthenticatorActivity.java	patch \|	diff1 \|	diff2 \|	blob \| history
src/com/owncloud/android/ui/activity/Preferences.java	patch \|	diff1 \|	diff2 \|	blob \| history