Merge tag '6.31' into 6.x 6.x
authorDavid Rothstein
Wed, 16 Apr 2014 21:56:37 +0000 (17:56 -0400)
committerDavid Rothstein
Wed, 16 Apr 2014 21:56:37 +0000 (17:56 -0400)
6.31 release

Conflicts:
CHANGELOG.txt
modules/system/system.module

1  2 
CHANGELOG.txt
modules/system/system.module

diff --cc CHANGELOG.txt
@@@ -1,7 -1,8 +1,11 @@@
  
- Drupal 6.31-dev, xxxx-xx-xx (development release)
++Drupal 6.32-dev, xxxx-xx-xx (development release)
 +----------------------
 +
+ Drupal 6.31, 2014-04-16
+ ----------------------
+ - Fixed security issues (information disclosure). See SA-CORE-2014-002.
  Drupal 6.30, 2014-01-15
  ----------------------
  - Fixed security issues (multiple vulnerabilities), see SA-CORE-2014-001.
@@@ -8,7 -8,7 +8,7 @@@
  /**
   * The current system version.
   */
- define('VERSION', '6.31-dev');
 -define('VERSION', '6.31');
++define('VERSION', '6.32-dev');
  
  /**
   * Core API compatibility.