Merge branch 'MDL-47576-master-fixup' of https://github.com/jethac/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 16 Oct 2014 09:03:08 +0000 (10:03 +0100)
committerDan Poltawski <dan@moodle.com>
Thu, 16 Oct 2014 09:03:08 +0000 (10:03 +0100)

Trivial merge