Merge branch 'MDL-55240-master' of git://github.com/junpataleta/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 18 Jul 2016 09:51:06 +0000 (10:51 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 18 Jul 2016 09:51:06 +0000 (10:51 +0100)
commit5e60c1d436d47f893c24a1a006ffe89b46a90496
tree83bda315bf71c44b945d36bbe9aea79adf60f272
parentfa57043eb695d8c52755cf96c7b0034fb130398b
parent667cec9ba18aa826a382520637127c8ca4a86fa8
Merge branch 'MDL-55240-master' of git://github.com/junpataleta/moodle