Merge branch 'MDL-44828-master' of git://github.com/junpataleta/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 17 Aug 2015 13:24:57 +0000 (14:24 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 17 Aug 2015 13:24:57 +0000 (14:24 +0100)

Trivial merge