Merge branch 'MDL-48944_m32v4' of https://github.com/sbourget/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 4 Jul 2016 14:56:00 +0000 (15:56 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 4 Jul 2016 14:56:00 +0000 (15:56 +0100)
commitc145e290a37296b739f0cd9f1d0051223daa363c
tree14edf767f86061ff7d977edd6c4985650802c1c5
parent7fddfd3768c1ef9121df5bf6ceea5411654338e8
parent1a99786ff8ede8cddc1ef061a1ac5801a93e9ab6
Merge branch 'MDL-48944_m32v4' of https://github.com/sbourget/moodle