Merge branch 'MDL-53728_30' of git://github.com/timhunt/moodle into MOODLE_30_STABLE
commitb512fdd040d8c3fa96ea126dd364bf03e28b2346
authorDan Poltawski <dan@moodle.com>
Mon, 11 Apr 2016 13:10:08 +0000 (11 14:10 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 11 Apr 2016 13:10:08 +0000 (11 14:10 +0100)
treeef26d6a54a7220a48af78eefcf45bd587d193d21
parent12f8cb4e562ae2e18130933f3a73b99c66ec85f3
parent7d82cbc6bb9505b2443a64a831e3fec7ca7911fb
Merge branch 'MDL-53728_30' of git://github.com/timhunt/moodle into MOODLE_30_STABLE