Merge branch 'develop' into refactor_remote_saml_authentication
authormasensio <masensio@solidgear.es>
Wed, 15 Jan 2014 10:00:37 +0000 (11:00 +0100)
committermasensio <masensio@solidgear.es>
Wed, 15 Jan 2014 10:00:37 +0000 (11:00 +0100)
commite65985bd33956fd20547e6cf4c6cb6875eb57171
tree3c74ca9f6114d7b79a99dc9c62592078efd212a4
parentea18765828292e6b0937498e867a65a774e79538
parentce5b3e311832b62f3849790e58ff8f16c9aff7a8
Merge branch 'develop' into refactor_remote_saml_authentication