From: Armin Ronacher <armin.ronacher@active-4.com>
Date: Mon, 29 Jul 2013 17:09:31 +0000 (+0200)
Subject: Merge branch '1.x-maintenance'
X-Git-Tag: 2.0~9
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=eead4a3773a241bbf2567f805a7fb26b4cf962a9;p=thirdparty%2Fbabel.git

Merge branch '1.x-maintenance'
---

eead4a3773a241bbf2567f805a7fb26b4cf962a9
diff --cc CHANGES
index cf35f3e4,8b93fd20..7dbaf25c
--- a/CHANGES
+++ b/CHANGES
@@@ -1,11 -1,16 +1,21 @@@
  Babel Changelog
  ===============
  
 +Version 2.0
 +-----------
 +
 +(release date to be decided, codename to be selected)
 +
+ Version 1.4
+ -----------
+ 
+ (bugfix release, release date to be decided)
+ 
+ - Fixed a bug that caused deprecated territory codes not being
+   converted properly by the subtag resolving.  This for instance
+   showed up when trying to use ``und_UK`` as a language code
+   which now properly resolves to ``en_GB``.
+ 
  Version 1.3
  -----------