Merge branch 'MDL-52523' of git://github.com/timhunt/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 21 Dec 2015 02:47:49 +0000 (10:47 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 21 Dec 2015 02:47:49 +0000 (10:47 +0800)

Trivial merge