Merge branch 'MDL-32188' of git://github.com/timhunt/moodle

Conflicts:
	lib/db/upgrade.php
This commit is contained in:
Sam Hemelryk 2013-10-08 14:43:36 +13:00
commit cbf34f34cc
74 changed files with 1680 additions and 298 deletions

View file

@ -29,7 +29,7 @@
defined('MOODLE_INTERNAL') || die();
$version = 2013100400.01; // YYYYMMDD = weekly release date of this DEV branch.
$version = 2013100800.00; // YYYYMMDD = weekly release date of this DEV branch.
// RR = release increments - 00 in DEV branches.
// .XX = incremental changes.