Merge branch 'MDL-40666-master' of git://github.com/danpoltawski/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 23 Jul 2013 02:09:08 +0000 (14:09 +1200)
committerSam Hemelryk <sam@moodle.com>
Tue, 23 Jul 2013 02:09:08 +0000 (14:09 +1200)
1  2 
enrol/externallib.php

Simple merge