From: masensio <masensio@solidgear.es>
Date: Tue, 27 Aug 2013 10:15:06 +0000 (+0200)
Subject: Merge branch 'saml_based_federated_single_sign_on' into saml_based_federated_single_s... 
X-Git-Tag: oc-android-1.4.6~17^2~2
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/da77406209034d1f078a6ab1c0df1f63ed86726b?hp=da77406209034d1f078a6ab1c0df1f63ed86726b

Merge branch 'saml_based_federated_single_sign_on' into saml_based_federated_single_sign_on_expired

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