Merge branch 'MDL-46398-master' of git://github.com/junpataleta/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 27 Jul 2015 09:26:25 +0000 (10:26 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 27 Jul 2015 09:26:25 +0000 (10:26 +0100)

Trivial merge