Merge branch 'MDL-51818_M30' of git://github.com/lazydaisy/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 9 Feb 2016 04:24:24 +0000 (12:24 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 9 Feb 2016 04:24:24 +0000 (12:24 +0800)

Trivial merge