Merge branch 'MDL-58567-master-fix' of git://github.com/junpataleta/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 7 Jun 2017 14:14:30 +0000 (15:14 +0100)
committerDan Poltawski <dan@moodle.com>
Wed, 7 Jun 2017 14:14:30 +0000 (15:14 +0100)
commit1cf710671780d957170286a8de713ed7c1ab6fe2
tree72a7aa298b9f8c3688e3bdb6a7d7574cdb904134
parent953df3696410e80aeba76305b6b652f71952f3c8
parent83740b9fc1b9a5b81c4b41f209a0ebc96e338a96
Merge branch 'MDL-58567-master-fix' of git://github.com/junpataleta/moodle