Merge branch 'MDL-50916_m31v2' of https://github.com/sbourget/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 5 Jan 2016 12:46:11 +0000 (12:46 +0000)
committerDan Poltawski <dan@moodle.com>
Tue, 5 Jan 2016 12:46:11 +0000 (12:46 +0000)
commit6393e3d971cb796e9ad3383ed58da4f9959331dd
tree8a485e8165de5bedd1399eb77c2a0c1941faacb8
parent4323a973d57a41e19e039a850ad71ebcabae73c1
parent21ee09206154c8c7181bdaab2fdf5fdd8783c9ca
Merge branch 'MDL-50916_m31v2' of https://github.com/sbourget/moodle