Merge branch 'MDL-52899' of git://github.com/timhunt/moodle
authorDavid Monllao <davidm@moodle.com>
Wed, 3 Feb 2016 05:44:41 +0000 (13:44 +0800)
committerDavid Monllao <davidm@moodle.com>
Wed, 3 Feb 2016 05:44:41 +0000 (13:44 +0800)

Trivial merge