Merge branch 'MDL-48881_m30v5' of git://github.com/sbourget/moodle
authorDavid Monllao <davidm@moodle.com>
Wed, 16 Sep 2015 05:20:52 +0000 (13:20 +0800)
committerDavid Monllao <davidm@moodle.com>
Wed, 16 Sep 2015 05:20:52 +0000 (13:20 +0800)

Trivial merge