Merge branch 'w15_MDL-32263_m23_enroladmin' of git://github.com/skodak/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 9 Apr 2012 22:48:34 +0000 (10:48 +1200)
committerSam Hemelryk <sam@moodle.com>
Mon, 9 Apr 2012 22:48:34 +0000 (10:48 +1200)
1  2 
lib/enrollib.php

Simple merge