Merge branch 'MDL-56564-master-2' of git://github.com/junpataleta/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 23 Nov 2016 11:27:20 +0000 (11:27 +0000)
committerDan Poltawski <dan@moodle.com>
Wed, 23 Nov 2016 11:27:20 +0000 (11:27 +0000)
commit68153d5cbc3799f23eaa13a3158dde2528e59d42
treea5e389b745636f996fc0ad9acc8c3b3779fe6a95
parentbe58f604b571cb7bd939207be0f42fafeccc05a8
parent1b669ebebaa707434d06627b39a7f23b14dc7cf1
Merge branch 'MDL-56564-master-2' of git://github.com/junpataleta/moodle