Merge branch 'saml_based_federated_single_sign_on' into sso_bug_changing_orientation
authorDavid A. Velasco <dvelasco@solidgear.es>
Wed, 21 Aug 2013 16:56:19 +0000 (18:56 +0200)
committerDavid A. Velasco <dvelasco@solidgear.es>
Wed, 21 Aug 2013 16:56:19 +0000 (18:56 +0200)

Trivial merge