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)
commit348c24b7edbdcc05d0d774ced9c9a8820e1a2033
tree8eebe4108243157c49340b2dfaeb6bbc593e3026
parentb9e9e0605266f797bc770947a6f6dfba87aeb176
parent62e62bb0629befa8209dd59a9ab1b7d8cf58ebd0
Merge branch 'develop' into check_server_certificates_in_SSO_webview