Merge branch 'MDL-45381_master' of git://github.com/markn86/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 8 Jul 2014 10:28:58 +0000 (11:28 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 8 Jul 2014 10:28:58 +0000 (11:28 +0100)

Trivial merge