Merge branch 'wip-MDL-44640-fix' of git://github.com/marinaglancy/moodle
authorDavid Monllao <davidm@moodle.com>
Wed, 30 Sep 2015 04:43:55 +0000 (12:43 +0800)
committerDavid Monllao <davidm@moodle.com>
Wed, 30 Sep 2015 04:43:55 +0000 (12:43 +0800)

Trivial merge