Merge branch 'wip-MDL-15471' of https://github.com/jennymgray/moodle

Conflicts: lib/db/upgrade.php version.php
2012-09-26 12:04:41 +08:00
parent 4aede312e7 7dd764b856
commit bb14cc2d23
16 changed files with 189 additions and 590 deletions
@@ -30,7 +30,7 @@
 defined('MOODLE_INTERNAL') || die();


-$version  = 2012092100.01;              // YYYYMMDD      = weekly release date of this DEV branch
+$version  = 2012092100.06;              // YYYYMMDD      = weekly release date of this DEV branch
                                        //         RR    = release increments - 00 in DEV branches
                                        //           .XX = incremental changes