Merge branch 'MDL-46982' of https://github.com/shashirepo/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 8 Sep 2014 11:22:27 +0000 (12:22 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 8 Sep 2014 11:22:27 +0000 (12:22 +0100)

Trivial merge