Merge branch 'MDL-59101-master' of git://github.com/junpataleta/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 7 Jun 2017 15:25:58 +0000 (16:25 +0100)
committerDan Poltawski <dan@moodle.com>
Wed, 7 Jun 2017 15:25:58 +0000 (16:25 +0100)
commit60d04b28e715218a2a17c7c40947a108e6f2c634
tree492c291ab626d7c9b02c521cc59fd6bb71bfa0a2
parent1cf710671780d957170286a8de713ed7c1ab6fe2
parent51807cf5c4d745c5a63c54ed520ca0296c84c7b8
Merge branch 'MDL-59101-master' of git://github.com/junpataleta/moodle