Merge branch 'MDL-51048' of git://github.com/timhunt/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 15 Sep 2015 05:40:55 +0000 (13:40 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 15 Sep 2015 05:40:55 +0000 (13:40 +0800)

Trivial merge