Merge branch 'MDL-57389-master' of git://github.com/jleyva/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 3 Jan 2017 18:07:12 +0000 (18:07 +0000)
committerDan Poltawski <dan@moodle.com>
Wed, 4 Jan 2017 11:33:58 +0000 (11:33 +0000)
commitc3e9e8bc3c6bf4d249dbc2a63af26705d5b2c0b1
tree2ed8c93449dc80652c4b0ab11b60612a122e04f2
parenta76b0b8b85df3dace16867a1d33f232bd5e00d71
parent91fff3914b3e0636456fa51061a796dd18c7caf3
Merge branch 'MDL-57389-master' of git://github.com/jleyva/moodle