Merge branch 'MDL-47759-master' of git://github.com/ankitagarwal/moodle
commit13c9e9c0431e699f82abecf4e7ff529038fd0019
authorMarina Glancy <marina@moodle.com>
Thu, 23 Oct 2014 08:35:59 +0000 (23 16:35 +0800)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Fri, 24 Oct 2014 09:48:08 +0000 (24 11:48 +0200)
treefef003159a0c40245b6b863dbb4e5b877b6a9360
parent578d905ec0b24da15348a9f16e27dd9f2adbce13
parent5875e287a52f5e65ee6de20b89bace0d29980968
Merge branch 'MDL-47759-master' of git://github.com/ankitagarwal/moodle
admin/tool/monitor/lang/en/tool_monitor.php