Merge branch 'MDL-57143-master' of https://github.com/LukeCarrier/moodle
commita127f448f0b127676ce0ff566db8b9f8a881a6c8
authorDavid Monllao <david.monllao@gmail.com>
Mon, 19 Dec 2016 11:54:04 +0000 (19 12:54 +0100)
committerDavid Monllao <david.monllao@gmail.com>
Mon, 19 Dec 2016 11:54:04 +0000 (19 12:54 +0100)
treeda910fad22c9c1008ad6abffd85831dcb0b79717
parenteacacae8cc81ad6799322610e2eede3b09d4683b
parent6f62abab2c95c345018dbc1dfa0e425bcd0c5e40
Merge branch 'MDL-57143-master' of https://github.com/LukeCarrier/moodle