Merge branch 'MDL-55740-master' of git://github.com/jleyva/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 3 Oct 2016 10:16:09 +0000 (11:16 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 3 Oct 2016 10:16:09 +0000 (11:16 +0100)
commitb885488c02106dadd964ad720d835631d0d1de6a
tree8fc76b87b3df333514b479ebec33488e1315810e
parentc59a6ffd53abf6459067e36cf64ee43200ab3433
parent114eaf519de64816b12ab0b43c2552babc7f191d
Merge branch 'MDL-55740-master' of git://github.com/jleyva/moodle