Merge branch 'MDL-32570-master' of git://github.com/danpoltawski/moodle
authorDamyon Wiese <damyon@moodle.com>
Tue, 8 Oct 2013 05:47:49 +0000 (13:47 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 8 Oct 2013 05:47:49 +0000 (13:47 +0800)
1  2 
enrol/imsenterprise/lib.php

Simple merge