Merge branch 'MDL-36986' of git://github.com/moodlerooms/moodle

diff --combined lib/db/events.php
index 769ad0b,5d9a230..07641db
--- 1/lib/db/events.php
--- 2/lib/db/events.php
+++ b/lib/db/events.php
@@@ -77,6 -77,7 +77,7 @@@ course_created - object course table re
  course_updated - object course table record
  course_content_removed - object course table record + context property
  course_deleted - object course table record + context property
+ course_restored - custom object with courseid, userid and restore information
  
  user_enrolled - object record from user_enrolments table + courseid,enrol
  user_enrol_modified - object record from user_enrolments table + courseid,enrol
@@@ -121,10 -122,4 +122,10 @@@ mod_deleted - int courseid, int cmid, t
  mod_created - int courseid, int cmid, text modulename - happens when a module is created
  mod_updated - int courseid, int cmid, text modulename - happens when a module is updated
  
 +=== blog events
 +
 +blog_entry_added - blog post object
 +blog_entry_edited - blog post object
 +blog_entry_deleteded - blog post object
 +
  */