Merge branch 'MDL-58227-31' of git://github.com/jleyva/moodle into MOODLE_31_STABLE
commitac5f2bc552fc05f158874ed7c81d0c1a360cbd47
authorDan Poltawski <dan@moodle.com>
Tue, 28 Mar 2017 15:00:25 +0000 (28 16:00 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 28 Mar 2017 15:00:25 +0000 (28 16:00 +0100)
tree0f92c50338a6de36e2d0ad62cd81bcf43664beca
parentf569989db30809e624009b2641447c686df48642
parent5efec4d5a3f494a4f46d78381d25daed1bd7fc44
Merge branch 'MDL-58227-31' of git://github.com/jleyva/moodle into MOODLE_31_STABLE