Merge branch 'MDL-59475-master-cas' of git://github.com/lameze/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 17 Jul 2017 13:18:21 +0000 (14:18 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 17 Jul 2017 13:18:21 +0000 (14:18 +0100)
commitefc1d2bb6b396fbc359dba569a261dc40fdd6694
tree59f1a6300714851b3905932b3519ca9db8fdccf8
parent7d04eaca5c43efe67216a681870658a77d686788
parent2a6224c27375bb7e2799e3dc7a6dd99995a25cb0
Merge branch 'MDL-59475-master-cas' of git://github.com/lameze/moodle