Merge branch 'MDL-51371-master' of git://github.com/jleyva/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 23 Sep 2015 15:08:20 +0000 (17:08 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 24 Sep 2015 13:38:14 +0000 (15:38 +0200)
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  = 2015092204.00;              // YYYYMMDD      = weekly release date of this DEV branch.
 -$version  = 2015091800.01;              // YYYYMMDD      = weekly release date of this DEV branch.
++$version  = 2015092300.00;              // YYYYMMDD      = weekly release date of this DEV branch.
                                          //         RR    = release increments - 00 in DEV branches.
                                          //           .XX = incremental changes.