Merge branch 'wip_MDL-48420_m29_lasttypo' of https://github.com/skodak/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 1 Dec 2014 17:08:56 +0000 (17:08 +0000)
committerDan Poltawski <dan@moodle.com>
Thu, 4 Dec 2014 11:37:52 +0000 (11:37 +0000)

Trivial merge