Merge branch 'MDL-40955-m' of git://github.com/andrewnicols/moodle

Conflicts:
	course/format/upgrade.txt

diff --cc course/format/upgrade.txt
index c484953,6451852..f29a06e
--- 1/course/format/upgrade.txt
--- 2/course/format/upgrade.txt
+++ b/course/format/upgrade.txt
@@@ -4,8 -4,9 +4,11 @@@ Overview of this plugin type at http://
  
  === 2.6 ===
  
 +* core_course_renderer::course_section_cm_edit_actions has two new optional arguments and now uses and action_menu component.
 +* core_course_renderer::course_section_cm has been altered to call core_course_renderer::course_section_cm_edit_actions with the two new arguments
+ * An additional course renderer function has been created which allows you to
+   specify the wrapper for a course module within a section (e.g. the <li>).  This can be
+   found in core_course_renderer::course_section_cm_list_item().
  
  === 2.5 ===
  

diff --cc course/renderer.php
Simple merge