Merge branch 'MDL-36334-master' of https://github.com/andrewnicols/moodle
authorDamyon Wiese <damyon@moodle.com>
Tue, 7 Jan 2014 08:10:05 +0000 (16:10 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 7 Jan 2014 08:10:05 +0000 (16:10 +0800)
1  2 
enrol/locallib.php

Simple merge