Merge branch 'wip-MDL-55494-master' of git://github.com/marinaglancy/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 15 Aug 2016 12:15:15 +0000 (13:15 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 15 Aug 2016 12:15:15 +0000 (13:15 +0100)
commit8d37a33b169eef6f0c3b26fc71c8faafb5c17e57
tree55237b6e6b0ce7be84d7a1a94cfb736050452d38
parentfb8723d9f5924ff9cdf5d060d457472383bd47d5
parentd29a07030efff49d55dd55a0d8a60573e983b3fc
Merge branch 'wip-MDL-55494-master' of git://github.com/marinaglancy/moodle
admin/tool/monitor/classes/eventlist.php
report/eventlist/classes/list_generator.php