Merge branch 'MDL-58826_32_STABLE' of https://github.com/marxjohnson/moodle into...
commit589b4c0360789e16e4f94b7418bda6b46437018f
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 5 Jun 2017 23:45:17 +0000 (6 01:45 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 5 Jun 2017 23:45:17 +0000 (6 01:45 +0200)
tree7309fc4eaee691040873b0dabc5b5ad5fb988805
parent5f6cf92f971607d3765c7e8eb9b9e340d18f7ae6
parent43391de3e26d346fd0417adb472d38ec0409d1eb
Merge branch 'MDL-58826_32_STABLE' of https://github.com/marxjohnson/moodle into MOODLE_32_STABLE