Merge branch 'MDL-61281_master' of git://github.com/dmonllao/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 29 Jan 2018 22:59:36 +0000 (23:59 +0100)
committerJake Dallimore <jake@moodle.com>
Thu, 1 Feb 2018 02:33:16 +0000 (10:33 +0800)

Trivial merge