Merge branch 'wip-MDL-40931-m26' of git://github.com/samhemelryk/moodle

Conflicts:
	version.php

diff --cc lib/outputlib.php
Simple merge

diff --cc lib/upgrade.txt
Simple merge

diff --cc version.php
index 9923818,05c26c2..ae0ed12
--- 1/version.php
--- 2/version.php
+++ b/version.php
@@@ -29,7 -29,7 +29,7 @@@
  
  defined('MOODLE_INTERNAL') || die();
  
- $version  = 2013082700.00;              // YYYYMMDD      = weekly release date of this DEV branch.
 -$version  = 2013082600.00;              // YYYYMMDD      = weekly release date of this DEV branch.
++$version  = 2013082700.01;              // YYYYMMDD      = weekly release date of this DEV branch.
                                          //         RR    = release increments - 00 in DEV branches.
                                          //           .XX = incremental changes.