Merge branch 'mdl38210-master' of https://github.com/tlock/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 6 Apr 2015 11:35:01 +0000 (12:35 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 6 Apr 2015 11:35:01 +0000 (12:35 +0100)

Trivial merge