Merge branch 'event_monitor' of git://github.com/ankitagarwal/moodle
authorDamyon Wiese <damyon@moodle.com>
Thu, 16 Oct 2014 05:20:45 +0000 (13:20 +0800)
committerDamyon Wiese <damyon@moodle.com>
Thu, 16 Oct 2014 05:20:45 +0000 (13:20 +0800)
1  2 
lib/classes/plugin_manager.php
lib/navigationlib.php

Simple merge
Simple merge