Merge branch 'MDL-44612-master' of git://github.com/junpataleta/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 30 Jan 2018 00:11:06 +0000 (01:11 +0100)
committerJake Dallimore <jake@moodle.com>
Thu, 1 Feb 2018 02:33:17 +0000 (10:33 +0800)

Trivial merge