From: Armin Ronacher <armin.ronacher@active-4.com>
Date: Sun, 28 Jul 2013 21:15:59 +0000 (+0200)
Subject: Merge branch '1.x-maintenance'
X-Git-Tag: 2.0~14
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e6cdac96de420ed9c556f810b40a38c69fba0836;p=thirdparty%2Fbabel.git

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

e6cdac96de420ed9c556f810b40a38c69fba0836
diff --cc CHANGES
index 08bbe2a9,13f1ad8a..66202f2d
--- a/CHANGES
+++ b/CHANGES
@@@ -1,11 -1,15 +1,20 @@@
  Babel Changelog
  ===============
  
 +Version 2.0
 +-----------
 +
 +(release date to be decided, codename to be selected)
 +
+ Version 1.3
+ -----------
+ 
+ (bugfix release, release date to be decided)
+ 
+ - Fixed a bug in likely-subtag resolving for some common locales.
+   This primarily makes ``zh_CN`` work again which was broken
+   due to how it was defined in the likely subtags combined with
+   our broken resolving.  This fixes #37.
  
  Version 1.2
  -----------