Merge branch 'wip-MDL-40931-m26' of git://github.com/samhemelryk/moodle
authorDamyon Wiese <damyon@moodle.com>
Tue, 27 Aug 2013 07:29:49 +0000 (15:29 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 27 Aug 2013 07:29:49 +0000 (15:29 +0800)
Conflicts:
version.php

1  2 
lib/outputlib.php
lib/upgrade.txt
version.php

Simple merge
diff --cc lib/upgrade.txt
Simple merge
diff --cc 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.