Merge branch 'MDL-38314-24' of git://github.com/FMCorz/moodle into MOODLE_24_STABLE

Conflicts:
	version.php
This commit is contained in:
Damyon Wiese
2013-07-08 15:16:42 +08:00
5 changed files with 132 additions and 1 deletions
+1 -1
View File
@@ -29,7 +29,7 @@
defined('MOODLE_INTERNAL') || die();
$version = 2012120305.00; // 20121203 = branching date YYYYMMDD - do not modify!
$version = 2012120305.01; // 20121203 = branching date YYYYMMDD - do not modify!
// RR = release increments - 00 in DEV branches
// .XX = incremental changes