Merge branch 'MDL-56350-master' of git://github.com/andrewnicols/moodle
commita809969691107a47baca2af25619e6c8a454d149
authorDan Poltawski <dan@moodle.com>
Mon, 24 Oct 2016 08:17:52 +0000 (24 09:17 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 24 Oct 2016 08:17:52 +0000 (24 09:17 +0100)
tree0b650bdca5873509ddbb7c6433bf87747bd8d417
parent8823be0b600b2c125e6c3a57114833966000a5a5
parent741c2d4617aa477edfdc62bdb83775c652486a68
Merge branch 'MDL-56350-master' of git://github.com/andrewnicols/moodle