Merge branch 'MDL-49666' of git://github.com/timhunt/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 31 Mar 2015 18:18:14 +0000 (19:18 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 31 Mar 2015 18:18:14 +0000 (19:18 +0100)

Trivial merge