Merge branch 'MDL-46459' of git://github.com/jleyva/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 28 Jul 2014 10:59:02 +0000 (11:59 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 28 Jul 2014 10:59:02 +0000 (11:59 +0100)

Trivial merge