Merge branch 'MDL-57283_master' of git://github.com/markn86/moodle
commitee1f658207ef4e1b947c3f0fed22ca79db45eff2
authorDan Poltawski <dan@moodle.com>
Wed, 7 Dec 2016 10:16:54 +0000 (7 10:16 +0000)
committerDan Poltawski <dan@moodle.com>
Wed, 7 Dec 2016 10:16:54 +0000 (7 10:16 +0000)
tree155a0b230d1eeb672ccc67fcae8b719aa15278f7
parenteec60baeca4683917170d6f24a402e9c0d721f2e
parent07af06df96728b9265c1632f5469e066dd405e6f
Merge branch 'MDL-57283_master' of git://github.com/markn86/moodle