Merge branch 'MDL-50711_M30' of git://github.com/lazydaisy/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 14 Jul 2015 07:45:27 +0000 (08:45 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 14 Jul 2015 07:45:27 +0000 (08:45 +0100)
commit22c844acf43dc125a2cafb8b58a1571e1b44f328
tree4294761cbdba61cf452194630135edcde31dab44
parent5852140e65de62743781f09827d3c2e42a2fe92b
parent0163c590f3c31da7dcada9a541a02fe9892b400b
Merge branch 'MDL-50711_M30' of git://github.com/lazydaisy/moodle