Merge branch 'MDL-47361_master' of https://github.com/markn86/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 3 Nov 2014 13:55:31 +0000 (13:55 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 3 Nov 2014 13:55:31 +0000 (13:55 +0000)
commite3d86c322b3d64f5d08d6413096176fea9d2fad2
treee0bf88e34c483329f771c711f2053017729ed040
parent1a27142afeeff6611c8f0e4057f94ceca71e0918
parent8ad2de40b19d440c0970d2c10a0dd362993cabcf
Merge branch 'MDL-47361_master' of https://github.com/markn86/moodle

Conflicts:
admin/tool/monitor/edit.php
admin/tool/monitor/lang/en/tool_monitor.php
admin/tool/monitor/classes/rule_form.php
admin/tool/monitor/edit.php
admin/tool/monitor/lang/en/tool_monitor.php