Merge branch 'wip-MDL-53274-fix' of https://github.com/marinaglancy/moodle
commite1ec2bbbf31469c182522fe7a05e4a27648b480d
authorDan Poltawski <dan@moodle.com>
Wed, 30 Mar 2016 05:01:42 +0000 (30 13:01 +0800)
committerDan Poltawski <dan@moodle.com>
Wed, 30 Mar 2016 05:01:42 +0000 (30 13:01 +0800)
treeb210141339bb49fa9bfb6fbe69a78fb2d75d7570
parent13e2c1bf580c23d57dce7ea5312132139801f64a
parent0a4f89e5b65106a509d3ec64e55f6bde4acd80eb
Merge branch 'wip-MDL-53274-fix' of https://github.com/marinaglancy/moodle