Merge branch 'MDL-51723-master' of git://github.com/andrewnicols/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 8 Feb 2016 01:02:41 +0000 (09:02 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 8 Feb 2016 01:02:41 +0000 (09:02 +0800)

Trivial merge