Merge branch 'MDL-58668-master' of git://github.com/jleyva/moodle
authorJun Pataleta <jun@moodle.com>
Wed, 26 Apr 2017 03:06:30 +0000 (11:06 +0800)
committerJun Pataleta <jun@moodle.com>
Wed, 26 Apr 2017 03:06:30 +0000 (11:06 +0800)

Trivial merge