Merge branch 'master-MDL-39409-auth-cas-use-moodle-web-proxy' of https://github.com...
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 5 Jun 2013 00:45:37 +0000 (02:45 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 5 Jun 2013 00:45:37 +0000 (02:45 +0200)
1  2 
auth/cas/auth.php

Simple merge