Merge branch 'MDL-39653-master' of git://github.com/danpoltawski/moodle
authorMarina Glancy <marina@moodle.com>
Tue, 1 Oct 2013 10:42:37 +0000 (20:42 +1000)
committerMarina Glancy <marina@moodle.com>
Tue, 1 Oct 2013 10:42:37 +0000 (20:42 +1000)
1  2 
enrol/imsenterprise/lib.php

Simple merge