Merge branch 'develop' into refactor_remote_saml_authentication
authormasensio <masensio@solidgear.es>
Fri, 17 Jan 2014 13:20:14 +0000 (14:20 +0100)
committermasensio <masensio@solidgear.es>
Fri, 17 Jan 2014 13:20:14 +0000 (14:20 +0100)
commit5581bd9c117472432c6897d9376ecf1dc0131ba6
tree8b615403f6247fcde2156833c1775d69fecdb81e
parent10dac352323cb6b39809da5b7a32a37ef7541f23
parent2f5806da4415b1a63c9feb003c6e7633f3721052
Merge branch 'develop' into refactor_remote_saml_authentication