Merge branch 'master' into saml_based_federated_single_sign_on_expired
authormasensio <masensio@solidgear.es>
Mon, 26 Aug 2013 08:20:59 +0000 (10:20 +0200)
committermasensio <masensio@solidgear.es>
Mon, 26 Aug 2013 08:20:59 +0000 (10:20 +0200)
commit5066193e58ea77f0a507d790f9487fc3269ae3b0
treed3ea4918d324c58b3b4f1bec22d7ebab3f85d566
parentdc02769e492205edce2a206cafe47152d526c09b
parent112cc0f80c006172b885a9f4b08c5736ab4298a1
Merge branch 'master' into saml_based_federated_single_sign_on_expired