Merge branch 'MDL-55287_master' of git://github.com/dmonllao/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 25 Jul 2016 14:55:48 +0000 (15:55 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 25 Jul 2016 14:55:48 +0000 (15:55 +0100)
commit5d21ea9d3b2ac3a041b03b4185b2fd02ef80ad55
treeb9593ff9a5b5346780ec18770431b423bbe59eba
parent12811fcc34b7576990961eedf02e4fa79272170c
parent379ca986421e7e1e3d639591c061214d96beef06
Merge branch 'MDL-55287_master' of git://github.com/dmonllao/moodle