Merge branch 'MDL-37707-master-fixup' of https://github.com/FMCorz/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 2 Oct 2014 08:48:25 +0000 (09:48 +0100)
committerDan Poltawski <dan@moodle.com>
Thu, 2 Oct 2014 08:48:25 +0000 (09:48 +0100)

Trivial merge