From: Erick Wilder <erickwilder@gmail.com>
Date: Mon, 24 Aug 2015 17:01:24 +0000 (-0300)
Subject: Log bugfix changes and bump new bugfix version
X-Git-Tag: 2.1.1~7^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F193%2Fhead;p=thirdparty%2Fbabel.git

Log bugfix changes and bump new bugfix version

Added @jun66j5 bug fix log entry to the CHANGES file
---

diff --git a/CHANGES b/CHANGES
index 9dc814d4..319f1d02 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,11 @@
 Babel Changelog
 ===============
 
+Version 2.1
+-----------
+(bugfix release, to be defined)
+- Fix Locale.parse using ``global.dat`` incompatible types (https://github.com/mitsuhiko/babel/issues/174)
+
 Version 2.0
 -----------
 
diff --git a/babel/__init__.py b/babel/__init__.py
index 6854931a..d8895038 100644
--- a/babel/__init__.py
+++ b/babel/__init__.py
@@ -21,4 +21,4 @@ from babel.core import UnknownLocaleError, Locale, default_locale, \
      negotiate_locale, parse_locale, get_locale_identifier
 
 
-__version__ = '2.0'
+__version__ = '2.1'
diff --git a/setup.py b/setup.py
index 2c27ce40..7052871b 100755
--- a/setup.py
+++ b/setup.py
@@ -32,7 +32,7 @@ class import_cldr(Command):
 
 setup(
     name='Babel',
-    version='2.0',
+    version='2.1',
     description='Internationalization utilities',
     long_description=\
 """A collection of tools for internationalizing Python applications.""",