Merge branch 'wip-MDL-50633-master2' of https://github.com/marinaglancy/moodle
commit2088c22e41d40d71e86d4847d65ba10ff5867515
authorDan Poltawski <dan@moodle.com>
Mon, 2 Nov 2015 14:04:44 +0000 (2 14:04 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 2 Nov 2015 14:04:44 +0000 (2 14:04 +0000)
tree3c8ce7c1a6f28e2d6af21e0ea48507005cf8526b
parentdeec0566504a3fec38d2ffd1630c7b435ec81cdb
parent57ee89569a0ff2da693296b9c03b0d3730e4e794
Merge branch 'wip-MDL-50633-master2' of https://github.com/marinaglancy/moodle