Merge branch 'MDL-58535-fix-c' of http://github.com/damyon/moodle
authorJun Pataleta <jun@moodle.com>
Fri, 5 May 2017 08:48:23 +0000 (16:48 +0800)
committerJun Pataleta <jun@moodle.com>
Fri, 5 May 2017 08:48:23 +0000 (16:48 +0800)

Trivial merge