Merge branch 'MDL-47980-master-fixup' of https://github.com/jethac/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 6 Nov 2014 08:58:27 +0000 (08:58 +0000)
committerDan Poltawski <dan@moodle.com>
Thu, 6 Nov 2014 08:58:27 +0000 (08:58 +0000)

Trivial merge