Merge remote-tracking branch 'origin' into saml_based_federated_single_sign_on
authormasensio <masensio@solidgear.es>
Fri, 23 Aug 2013 07:09:40 +0000 (09:09 +0200)
committermasensio <masensio@solidgear.es>
Fri, 23 Aug 2013 07:09:40 +0000 (09:09 +0200)
commit913a74d9f833da925b2b6d7ec3011dbd82666fc9
treeadde9ac829e50abc0a778747bcb3450c1f97220c
parent540d4e87b9b77180d1b061088e5e99aaf220fb57
parent20afb728fe9e61bb48fa75e35f0de2fbde489b20
Merge remote-tracking branch 'origin' into saml_based_federated_single_sign_on