Merge branch 'MDL-44492' of git://github.com/timhunt/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 8 Jul 2014 13:17:56 +0000 (14:17 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 8 Jul 2014 13:17:56 +0000 (14:17 +0100)

Trivial merge