Merge branch 'MDL-45504' of git://github.com/stronk7/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 6 Oct 2014 13:00:20 +0000 (14:00 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 6 Oct 2014 13:00:20 +0000 (14:00 +0100)

Trivial merge