Merge branch 'MDL-41143-master' of git://github.com/FMCorz/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 20 Aug 2013 10:21:17 +0000 (18:21 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 20 Aug 2013 10:21:17 +0000 (18:21 +0800)
Conflicts:
version.php

1  2 
mod/forum/lib.php
version.php

Simple merge
diff --cc version.php
  
  defined('MOODLE_INTERNAL') || die();
  
- $version  = 2013081600.00;              // YYYYMMDD      = weekly release date of this DEV branch.
 -$version  = 2013081500.01;              // YYYYMMDD      = weekly release date of this DEV branch
 -                                        //         RR    = release increments - 00 in DEV branches
 -                                        //           .XX = incremental changes
++$version  = 2013082000.00;              // YYYYMMDD      = weekly release date of this DEV branch.
 +                                        //         RR    = release increments - 00 in DEV branches.
 +                                        //           .XX = incremental changes.
  
 -$release  = '2.6dev (Build: 20130815)'; // Human-friendly version name
 +$release  = '2.6dev (Build: 20130815)'; // Human-friendly version name.
  
 -$branch   = '26';                       // this version's branch
 -$maturity = MATURITY_ALPHA;             // this version's maturity level
 +$branch   = '26';                       // This version's branch.
 +$maturity = MATURITY_ALPHA;             // This version's maturity level.