Merge branch 'MDL-52209-master' of git://github.com/junpataleta/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 7 Dec 2015 15:04:40 +0000 (15:04 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 7 Dec 2015 15:04:40 +0000 (15:04 +0000)

Trivial merge