Drupal 6.22

diff --cc CHANGELOG.txt
index afbe399,1f48dff..8f6f713
--- 1/CHANGELOG.txt
--- 2/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@@ -1,6 -1,7 +1,14 @@@
  
- Drupal 6.21-dev, xxxx-xx-xx (development release)
++Drupal 6.22, 2011-05-25
 +----------------------
++- Made Drupal 6 work better with IIS and Internet Explorer.
++- Fixed .po file imports to work better with custom textgroups.
++- Improved code documentation at various places.
++- Fixed a variety of other bugs.
++
+ Drupal 6.21, 2011-05-25
+ ----------------------
+ - Fixed security issues (Cross site scripting), see SA-CORE-2011-001.
  
  Drupal 6.20, 2010-12-15
  ----------------------

diff --cc includes/common.inc
Simple merge

diff --cc modules/color/color.install
Simple merge

diff --cc modules/color/color.module
Simple merge

diff --cc modules/system/system.module
index e9583d7,bc92ab9..bc540a7
--- 1/modules/system/system.module
--- 2/modules/system/system.module
+++ b/modules/system/system.module
@@@ -8,7 -8,7 +8,7 @@@
  /**
   * The current system version.
   */
- define('VERSION', '6.21-dev');
 -define('VERSION', '6.21');
++define('VERSION', '6.22');
  
  /**
   * Core API compatibility.