Merge branch 'MDL-43089' of git://github.com/mkassaei/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 6 Oct 2014 11:11:33 +0000 (12:11 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 6 Oct 2014 11:11:33 +0000 (12:11 +0100)

Trivial merge