Merge branch 'MDL-29262' of git://github.com/stronk7/moodle

Conflicts:
	version.php
This commit is contained in:
Dan Poltawski 2012-04-23 12:42:16 +08:00
commit e0ed91ba39
8 changed files with 122 additions and 33 deletions

View file

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