Merge branch 'master' into saml_based_federated_single_sign_on
authormasensio <masensio@solidgear.es>
Mon, 26 Aug 2013 08:19:37 +0000 (10:19 +0200)
committermasensio <masensio@solidgear.es>
Mon, 26 Aug 2013 08:19:37 +0000 (10:19 +0200)
commit0a7d508f92c758a47376bf833c54c2511482f1f4
treeaea0643c57747a52ef84a60552bf495c4b89d7dc
parentea5cd96679e66b81f9789b5667eecfc99846de1a
parent112cc0f80c006172b885a9f4b08c5736ab4298a1
Merge branch 'master' into saml_based_federated_single_sign_on