Merge branch 'MDL-52354-master' of git://github.com/junpataleta/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 21 Dec 2015 16:45:15 +0000 (16:45 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 21 Dec 2015 16:45:15 +0000 (16:45 +0000)

Trivial merge