Merge branch 'MDL-44054' of git://github.com/timhunt/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 3 Jun 2014 11:58:34 +0000 (12:58 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 3 Jun 2014 11:58:34 +0000 (12:58 +0100)

Trivial merge