Merge branch 'MDL-43784-master-fixup' of git://github.com/FMCorz/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 26 Mar 2014 08:25:39 +0000 (16:25 +0800)
committerDan Poltawski <dan@moodle.com>
Wed, 26 Mar 2014 08:25:39 +0000 (16:25 +0800)

Trivial merge