Merge branch 'develop' into check_server_certificates_in_SSO_webview
authormasensio <masensio@solidgear.es>
Fri, 7 Mar 2014 08:42:23 +0000 (09:42 +0100)
committermasensio <masensio@solidgear.es>
Fri, 7 Mar 2014 08:42:23 +0000 (09:42 +0100)

Trivial merge