Merge branch 'MDL-47767-master' of git://github.com/xow/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 23 Oct 2014 09:50:01 +0000 (10:50 +0100)
committerDan Poltawski <dan@moodle.com>
Thu, 23 Oct 2014 09:50:01 +0000 (10:50 +0100)
commitcd9f037e040d93aa4a3bbf415b3ddd7ff4f3948f
tree1d53051a40c31ad2775a046639de5187ff0446a6
parent7ea782ab3c9c2f7ee22c50850e7c52f8172b4b3e
parent66f5e82b66d77befa347886f7623cc6e7b5ec5b8
Merge branch 'MDL-47767-master' of git://github.com/xow/moodle
admin/tool/monitor/lang/en/tool_monitor.php