Merge branch 'MDL-24343-master' of git://github.com/andrewnicols/moodle

diff --cc lib/upgrade.txt
index 7d08067,1686473..926ad3d
--- 1/lib/upgrade.txt
--- 2/lib/upgrade.txt
+++ b/lib/upgrade.txt
@@@ -46,7 -48,8 +48,9 @@@ information provided here is intended e
    Calling them through the magic method __call() will throw a coding exception.
  * The alfresco library has been removed from core. It was an old version of
    the library which was not compatible with newer versions of Alfresco.
 +* Added down arrow: $OUTPUT->darrow.
+ * All file_packer implementations now accept an additional parameter to allow a simple boolean return value instead of
+   an array of individual file statuses.
  
  === 3.1 ===