Merge branch 'MDL-52399-master' of git://github.com/jleyva/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 21 Dec 2015 12:45:30 +0000 (12:45 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 21 Dec 2015 12:45:30 +0000 (12:45 +0000)
1  2 
lib/db/services.php
version.php

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