From: masensio <masensio@solidgear.es>
Date: Thu, 22 Aug 2013 10:59:56 +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~12
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/dea37f653c4ec0e39ea3c8d30809996660b5816f?hp=dea37f653c4ec0e39ea3c8d30809996660b5816f

Merge branch 'saml_based_federated_single_sign_on' into saml_based_federated_single_sign_on_expired

Conflicts:
	res/values-es/strings.xml
	src/com/owncloud/android/operations/SynchronizeFolderOperation.java
---