Merge branch 'MDL-41598-master' of https://github.com/mackensen/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 27 Jul 2015 14:24:31 +0000 (15:24 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 27 Jul 2015 14:24:31 +0000 (15:24 +0100)
1  2 
auth/shibboleth/index.php

Simple merge