Merge branch 'MDL-47122' of git://github.com/timhunt/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 8 Sep 2014 13:28:30 +0000 (14:28 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 8 Sep 2014 13:28:30 +0000 (14:28 +0100)

Trivial merge