Merge branch 'saml_based_federated_single_sign_on' into saml_based_federated_single_s...
authormasensio <masensio@solidgear.es>
Thu, 22 Aug 2013 10:59:56 +0000 (12:59 +0200)
committermasensio <masensio@solidgear.es>
Thu, 22 Aug 2013 10:59:56 +0000 (12:59 +0200)
commitdea37f653c4ec0e39ea3c8d30809996660b5816f
treedb747999a2c4a59548e0543348c03be0f7ca62a7
parent7ed9e80013fdc384ea83c57e8a3d03b575abf412
parent540d4e87b9b77180d1b061088e5e99aaf220fb57
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
res/values-es/strings.xml
src/com/owncloud/android/operations/RemoteOperationResult.java
src/com/owncloud/android/operations/SynchronizeFolderOperation.java