Merge branch 'MDL-59171-master' of git://github.com/junpataleta/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 13 Jun 2017 13:40:06 +0000 (14:40 +0100)
committerDan Poltawski <dan@moodle.com>
Wed, 14 Jun 2017 11:36:39 +0000 (12:36 +0100)
commit7419853951ef03467144eefb3a76186c78208a7c
treef35808c4790ec2cbff28a6ec35e3f49a274af2a3
parente66905375ec5aed7c35df3399fcc1f2b05d26c1e
parent9332accdc5312bb86a2289360c87c895dd311c3c
Merge branch 'MDL-59171-master' of git://github.com/junpataleta/moodle