Merge branch 'MDL-52791' of git://github.com/timhunt/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 25 Jan 2016 14:26:59 +0000 (14:26 +0000)
committerDavid Monllao <davidm@moodle.com>
Fri, 29 Jan 2016 02:15:19 +0000 (10:15 +0800)

Trivial merge