Merge branch 'MDL-36985-master-fix' of github.com:xow/moodle
authorJun Pataleta <jun@moodle.com>
Thu, 24 Aug 2017 01:30:32 +0000 (09:30 +0800)
committerJun Pataleta <jun@moodle.com>
Thu, 24 Aug 2017 01:30:32 +0000 (09:30 +0800)

Trivial merge