Merge branch 'MDL-45893-master-fixup' of https://github.com/FMCorz/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 8 Oct 2014 09:42:20 +0000 (10:42 +0100)
committerDan Poltawski <dan@moodle.com>
Wed, 8 Oct 2014 09:42:20 +0000 (10:42 +0100)

Trivial merge