Merge branch 'MDL-52638_m29v1' of https://github.com/sbourget/moodle into MOODLE_29_S...
commit82470d8ebcf2289547c591c03089ecef39c7b037
authorDan Poltawski <dan@moodle.com>
Mon, 4 Jan 2016 11:36:41 +0000 (4 11:36 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 4 Jan 2016 11:36:41 +0000 (4 11:36 +0000)
treec7ad34171ca2e01e79571518ba294a516625e7f2
parent048f8d9ae77cfc6902f97d72786c7ecb612e41c7
parente259354c91c577ab3959c439ef04871243ef300e
Merge branch 'MDL-52638_m29v1' of https://github.com/sbourget/moodle into MOODLE_29_STABLE