Merge branch 'MDL-49682-master' of git://github.com/andrewnicols/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 12 Oct 2015 06:05:02 +0000 (14:05 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 12 Oct 2015 06:05:02 +0000 (14:05 +0800)

Trivial merge