Merge branch 'MDL-51306' of https://github.com/andrewhancox/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 8 Feb 2016 03:23:34 +0000 (11:23 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 8 Feb 2016 03:23:34 +0000 (11:23 +0800)

Trivial merge