Merge branch 'MDL_45619_m29v5' of git://github.com/sbourget/moodle
authorDavid Monllao <davidm@moodle.com>
Wed, 25 Mar 2015 01:38:24 +0000 (09:38 +0800)
committerDavid Monllao <davidm@moodle.com>
Wed, 25 Mar 2015 01:38:24 +0000 (09:38 +0800)

Trivial merge