Merge branch 'MDL-50269_master' of git://github.com/markn86/moodle

Conflicts:
	lib/upgrade.txt

diff --cc lib/upgrade.txt
index 5a732f1,34f0ed2..bc76325
--- 1/lib/upgrade.txt
--- 2/lib/upgrade.txt
+++ b/lib/upgrade.txt
@@@ -3,10 -3,7 +3,11 @@@ information provided here is intended e
  
  === 3.1 ===
  
 +* Plugins can extend the navigation for user by declaring the following callback:
 +  <frankenstyle>_extend_navigation_user(navigation_node $parentnode, stdClass $user,
 +                                        context_user $context, stdClass $course,
 +                                        context_course $coursecontext)
+ * The function notify() now throws a debugging message - see MDL-50269.
  
  === 3.0 ===