Merge branch 'MDL-36713_m32v2' of https://github.com/sbourget/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 16 Aug 2016 11:04:18 +0000 (12:04 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 16 Aug 2016 11:04:18 +0000 (12:04 +0100)
commitd6e7b38844680cd82afa2f827296ca29e25691b0
tree6f3516215d321791d3237161136521133a3d0ece
parent9d8a3055c064d2177ac6e939f3d17392f10be699
parent67a1f63913f8ec6f2e47923b98209f0637faf43e
Merge branch 'MDL-36713_m32v2' of https://github.com/sbourget/moodle