Merge branch 'MDL-61224_33' of git://github.com/markn86/moodle into MOODLE_33_STABLE
commit9db5265f18f2ceaf56fc5a1e549d98c2d321a062
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 22 Jan 2018 00:23:26 +0000 (22 01:23 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 22 Jan 2018 00:23:26 +0000 (22 01:23 +0100)
treee339a5893444c60de86b160b0130fbce7028277e
parent68673fb78d76557d4ba66ba01420246c8b0ce390
parentfde9d39538073a43c726105cc96113f96d852144
Merge branch 'MDL-61224_33' of git://github.com/markn86/moodle into MOODLE_33_STABLE