Merge branch 'MDL-55323-master' of git://github.com/junpataleta/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 1 Aug 2016 12:58:20 +0000 (13:58 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 1 Aug 2016 12:58:20 +0000 (13:58 +0100)
commit066e31fd740e41e010f91d80c064e3a9395a3bd1
tree83487f26a763d6b9b84b40f3343483c6134f5534
parent307e63cb00ff3b0a06dd8461c0f36c654b8ec2f3
parentfe15136d3746f00ab87913ad417c07b580e1d632
Merge branch 'MDL-55323-master' of git://github.com/junpataleta/moodle