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

2011-06-08 10:11:51 +08:00
parent 78736e5d64 8d46dabb6e
commit 0373264c20
5 changed files with 231 additions and 2 deletions
@@ -30,7 +30,7 @@
 defined('MOODLE_INTERNAL') || die();


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