Merge branch '45513-28-defines' of git://github.com/samhemelryk/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 3 Jun 2014 11:20:41 +0000 (12:20 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 3 Jun 2014 11:20:41 +0000 (12:20 +0100)

Trivial merge