Merge branch 'MDL-5875-master' of git://github.com/FMCorz/moodle
authorDamyon Wiese <damyon@moodle.com>
Tue, 12 Feb 2013 02:09:26 +0000 (10:09 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 12 Feb 2013 02:09:26 +0000 (10:09 +0800)
Conflicts:
version.php

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

Simple merge
diff --cc version.php
@@@ -30,7 -30,7 +30,7 @@@
  defined('MOODLE_INTERNAL') || die();
  
  
- $version  = 2013021200.00;              // YYYYMMDD      = weekly release date of this DEV branch
 -$version  = 2013020800.01;              // YYYYMMDD      = weekly release date of this DEV branch
++$version  = 2013021200.01;              // YYYYMMDD      = weekly release date of this DEV branch
                                          //         RR    = release increments - 00 in DEV branches
                                          //           .XX = incremental changes