Merge branch 'MDL-46696-master-fixup' of https://github.com/FMCorz/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 9 Sep 2014 07:46:01 +0000 (08:46 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 9 Sep 2014 07:46:01 +0000 (08:46 +0100)

Trivial merge