Merge branch 'MDL-47892-master' of git://github.com/lameze/moodle
commit6863c0de492278df33ba222f8b25c0c1a4a3922b
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Fri, 31 Oct 2014 17:57:30 +0000 (31 18:57 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Fri, 31 Oct 2014 17:57:30 +0000 (31 18:57 +0100)
treec0529966e17f52708805712c0a8c2097fc684aaa
parent58413f613e347c94ac173189dc2a2ed590ee8339
parented9084f70ba3f3d601793b0a7ba93d105e8bfe28
Merge branch 'MDL-47892-master' of git://github.com/lameze/moodle
admin/tool/monitor/lang/en/tool_monitor.php