Merge branch 'MDL-49183_m29v5' of git://github.com/sbourget/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 24 Feb 2015 08:07:18 +0000 (16:07 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 24 Feb 2015 08:07:18 +0000 (16:07 +0800)

Trivial merge