Merge branch 'MDL-51128-master' of git://github.com/junpataleta/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 2 Nov 2015 14:07:10 +0000 (14:07 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 2 Nov 2015 14:07:10 +0000 (14:07 +0000)

Trivial merge