Merge branch 'MDL-56050-master' of git://github.com/lameze/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 10 Oct 2016 15:14:43 +0000 (23:14 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 10 Oct 2016 15:14:43 +0000 (23:14 +0800)
commit97f1af757555d712dfdc51f9207bce2bf896f81e
treecfb6f18d9fc6656eaaab47ec23831abaa66e9bc1
parent3e1dd8791b8c0006cc38aab2f3325eccfbfedf91
parenta4ea86f65aa212d1151e8cc13073f23d9fb29e5e
Merge branch 'MDL-56050-master' of git://github.com/lameze/moodle
lib/moodlelib.php