Merge branch 'w02_MDL-37429_m25_zippacker' of git://github.com/skodak/moodle

Conflicts:
	lib/upgrade.txt

diff --cc lib/upgrade.txt
index 468691f,f5d3c5a..be68826
--- 1/lib/upgrade.txt
--- 2/lib/upgrade.txt
+++ b/lib/upgrade.txt
@@@ -3,10 -3,8 +3,12 @@@ information provided here is intended e
  
  === 2.5 ===
  
 +* Functions responsible for output in course/lib.php are deprecated, the code is moved to
 +  appropriate renderers: print_section_add_menus()
 +  See functions' phpdocs in lib/deprecatedlib.php
 +* Function get_print_section_cm_text() is deprecated, replaced with methods in cm_info
+ * zip_packer may create empty zip archives, there is a new option to ignore
+   problematic files when creating archive
  
  === 2.4 ===