Merge branch 'MDL-47710' of git://github.com/timhunt/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 16 Oct 2014 10:35:19 +0000 (11:35 +0100)
committerDan Poltawski <dan@moodle.com>
Thu, 16 Oct 2014 10:35:19 +0000 (11:35 +0100)

Trivial merge