Merge branch 'MDL-25012' of git://github.com/danpoltawski/moodle

Conflicts: lib/db/upgrade.php version.php
2012-08-15 00:41:04 +02:00
parent 267c898bfd 6a2a055edc
commit 76b97631b0
22 changed files with 56 additions and 340 deletions
@@ -30,7 +30,7 @@
 defined('MOODLE_INTERNAL') || die();


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