Merge branch 'develop' into regular_authentication_in_saml_server
authorDavid A. Velasco <dvelasco@solidgear.es>
Fri, 21 Mar 2014 10:02:36 +0000 (11:02 +0100)
committerDavid A. Velasco <dvelasco@solidgear.es>
Fri, 21 Mar 2014 10:02:36 +0000 (11:02 +0100)

Trivial merge