Merge branch 'MDL-47782-master' of git://github.com/lameze/moodle
authorDan Poltawski <dan@moodle.com>
Fri, 24 Oct 2014 14:25:42 +0000 (15:25 +0100)
committerDan Poltawski <dan@moodle.com>
Fri, 24 Oct 2014 14:25:42 +0000 (15:25 +0100)
commitf6dbc2bb9c7d386c0fa248ddbab3187a9d42e220
tree9d9ac4c7a3926a8b05d943ddb38846745218ee91
parent22ef599c5d64260a5a0e86785ba603397a428843
parent7bd88b003962c30409a53b00f7270f79dad6c39e
Merge branch 'MDL-47782-master' of git://github.com/lameze/moodle

Conflicts:
admin/tool/monitor/lang/en/tool_monitor.php
admin/tool/monitor/classes/output/managerules/renderable.php
admin/tool/monitor/lang/en/tool_monitor.php