Merge branch 'saml_based_federated_single_sign_on' into saml_based_federated_single_s...
authorDavid A. Velasco <dvelasco@solidgear.es>
Fri, 23 Aug 2013 07:08:51 +0000 (09:08 +0200)
committerDavid A. Velasco <dvelasco@solidgear.es>
Fri, 23 Aug 2013 07:08:51 +0000 (09:08 +0200)

Trivial merge