Merge branch 'MDL-53304' of git://github.com/timhunt/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 14 Mar 2016 05:26:12 +0000 (13:26 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 14 Mar 2016 05:26:12 +0000 (13:26 +0800)

Trivial merge