Merge branch 'MDL-46481-master-fixup' of https://github.com/FMCorz/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 9 Oct 2014 11:16:43 +0000 (12:16 +0100)
committerDan Poltawski <dan@moodle.com>
Thu, 9 Oct 2014 11:16:43 +0000 (12:16 +0100)

Trivial merge