Merge branch 'wip-MDL-32547-master-v2' of git://github.com/abgreeve/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 1 Dec 2014 16:23:41 +0000 (16:23 +0000)
committerDan Poltawski <dan@moodle.com>
Thu, 4 Dec 2014 11:37:48 +0000 (11:37 +0000)
Conflicts:
version.php

1  2 
lang/en/admin.php
version.php

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