Merge branch 'MDL-54763_master' of git://github.com/markn86/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 31 May 2016 04:31:36 +0000 (12:31 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 31 May 2016 04:31:36 +0000 (12:31 +0800)

Trivial merge