Merge branch 'wip-MDL-50580-master' of git://github.com/marinaglancy/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 22 Jun 2015 04:48:26 +0000 (12:48 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 22 Jun 2015 04:48:26 +0000 (12:48 +0800)

Trivial merge