Merge branch 'MDL-46088-master' of git://github.com/timhunt/moodle
authorDan Poltawski <dan@moodle.com>
Fri, 24 Oct 2014 16:10:56 +0000 (17:10 +0100)
committerDan Poltawski <dan@moodle.com>
Fri, 24 Oct 2014 16:10:56 +0000 (17:10 +0100)

Trivial merge