Merge branch 'MDL-47106' of git://github.com/timhunt/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 21 Dec 2015 03:32:56 +0000 (11:32 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 21 Dec 2015 03:32:56 +0000 (11:32 +0800)

Trivial merge