From: Isaac Jurado <diptongo@gmail.com>
Date: Sat, 26 Sep 2015 19:35:06 +0000 (+0200)
Subject: CHANGES: Add an older change that was skipped
X-Git-Tag: dev-2a51c9b95d06~11^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F262%2Fhead;p=thirdparty%2Fbabel.git

CHANGES: Add an older change that was skipped

When merging https://github.com/python-babel/babel/pull/180, the CHANGES file
modification was not performed.
---

diff --git a/CHANGES b/CHANGES
index 61875654..79723f7e 100644
--- a/CHANGES
+++ b/CHANGES
@@ -14,6 +14,8 @@ Version 2.1
 
 (Bugfix/minor feature release, released on September 25th 2015)
 
+- Parse and honour the locale inheritance exceptions
+  (https://github.com/python-babel/babel/issues/97)
 - Fix Locale.parse using ``global.dat`` incompatible types 
   (https://github.com/python-babel/babel/issues/174)
 - Fix display of negative offsets in ``FixedOffsetTimezone``