Merge branch 'MDL-40988' of git://github.com/mkassaei/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 6 Apr 2015 11:07:34 +0000 (12:07 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 6 Apr 2015 11:07:34 +0000 (12:07 +0100)

Trivial merge