Merged branch 'MDL-27566-wip' of git://github.com/mouneyrac/moodle.git with changes and conflict resolution for MDL-27566

This commit is contained in:
Sam Hemelryk
2011-06-08 10:02:59 +08:00
5 changed files with 190 additions and 2 deletions
+1 -1
View File
@@ -30,7 +30,7 @@
defined('MOODLE_INTERNAL') || die();
$version = 2011060500.00; // YYYYMMDD = weekly release date of this DEV branch
$version = 2011060500.01; // YYYYMMDD = weekly release date of this DEV branch
// RR = release increments - 00 in DEV branches
// .XX = incremental changes