Merge branch 'MDL-47922-master' of git://github.com/ankitagarwal/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 5 Nov 2014 11:18:22 +0000 (11:18 +0000)
committerDan Poltawski <dan@moodle.com>
Wed, 5 Nov 2014 11:18:22 +0000 (11:18 +0000)
commit7ea14bb81953008f67a9af5a1842dde670feed58
tree2bba73c34f509b11477d821a86618e3aaeed5896
parenta0cba367bdf00adad4d1d504181236ee69766173
parentf63c5b041375ad04336eedab0192afb6dfb49d9e
Merge branch 'MDL-47922-master' of git://github.com/ankitagarwal/moodle
admin/tool/monitor/lang/en/tool_monitor.php