Merge branch 'wip-MDL-34859-fix' of https://github.com/marinaglancy/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 22 Mar 2017 08:52:57 +0000 (08:52 +0000)
committerDan Poltawski <dan@moodle.com>
Wed, 22 Mar 2017 08:52:57 +0000 (08:52 +0000)
commitd959810fcf5c7d90b674f035a359b0727ea8ac14
tree6becbadeb8dc72019e83a7b790e85df3704773b1
parent745f79dad44bc8ee03bddd54000e81a03720ac9d
parentcc401e6f309abc1852b2b9d58995b71ac6fac3f5
Merge branch 'wip-MDL-34859-fix' of https://github.com/marinaglancy/moodle