Merge branch 'MDL-28134_branch' of git://github.com/nebgor/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 10 May 2012 05:44:03 +0000 (13:44 +0800)
committerDan Poltawski <dan@moodle.com>
Thu, 10 May 2012 05:44:03 +0000 (13:44 +0800)
1  2 
lib/setuplib.php
version.php

Simple merge
diff --cc version.php
@@@ -34,6 -34,7 +34,7 @@@ $version  = 2012050400.02
                                          //         RR    = release increments - 00 in DEV branches
                                          //           .XX = incremental changes
  
 -$release  = '2.3dev (Build: 20120427)'; // Human-friendly version name
 +$release  = '2.3dev (Build: 20120504)'; // Human-friendly version name
  
+ $branch = '23';                         // this version's branch
  $maturity = MATURITY_ALPHA;             // this version's maturity level