Merge branch 'develop' into check_server_certificates_in_SSO_webview

author masensio <masensio@solidgear.es>

Wed, 12 Mar 2014 07:44:56 +0000 (08:44 +0100)

committer masensio <masensio@solidgear.es>

Wed, 12 Mar 2014 07:44:56 +0000 (08:44 +0100)
author masensio <masensio@solidgear.es>
Wed, 12 Mar 2014 07:44:56 +0000 (08:44 +0100)
committer masensio <masensio@solidgear.es>
Wed, 12 Mar 2014 07:44:56 +0000 (08:44 +0100)
diff --cc res/values/strings.xml
Simple merge
diff --cc src/com/owncloud/android/authentication/AuthenticatorActivity.java
Simple merge
author	masensio <masensio@solidgear.es>
	Wed, 12 Mar 2014 07:44:56 +0000 (08:44 +0100)
committer	masensio <masensio@solidgear.es>
	Wed, 12 Mar 2014 07:44:56 +0000 (08:44 +0100)
		1	2
res/values/strings.xml	patch \|	diff1 \|	diff2 \|	blob \| history
src/com/owncloud/android/authentication/AuthenticatorActivity.java	patch \|	diff1 \|	diff2 \|	blob \| history