Merge branch 'wip-MDL-40648-master' of git://github.com/marinaglancy/moodle
authorDamyon Wiese <damyon@moodle.com>
Tue, 23 Jul 2013 02:37:20 +0000 (10:37 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 23 Jul 2013 02:37:20 +0000 (10:37 +0800)
Conflicts:
version.php

1  2 
lib/editor/tinymce/plugins/spellchecker/lib.php
version.php

diff --cc version.php
@@@ -29,7 -29,7 +29,7 @@@
  
  defined('MOODLE_INTERNAL') || die();
  
- $version  = 2013071900.02;              // YYYYMMDD      = weekly release date of this DEV branch
 -$version  = 2013071900.01;              // YYYYMMDD      = weekly release date of this DEV branch
++$version  = 2013072300.00;              // YYYYMMDD      = weekly release date of this DEV branch
                                          //         RR    = release increments - 00 in DEV branches
                                          //           .XX = incremental changes