Merge branch 'MDL-51837-master' of git://github.com/junpataleta/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 9 Nov 2015 11:33:00 +0000 (11:33 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 9 Nov 2015 11:33:00 +0000 (11:33 +0000)

Trivial merge