From 876309ad970580844253409b9d236b8351595318 Mon Sep 17 00:00:00 2001
From: Florent Xicluna <florent.xicluna@gmail.com>
Date: Sun, 30 Mar 2014 23:04:48 +0200
Subject: [PATCH] Add changelog entries

---
 CHANGES.rst        | 9 +++++++++
 flake8/__init__.py | 2 +-
 setup.py           | 4 ++--
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index db6646b..304b342 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,6 +1,14 @@
 CHANGES
 =======
 
+2.1.1 - unreleased
+------------------
+
+- Fix Git and Mercurial hooks, issues #88 and #133
+- Fix crashes with Python 3.4 by upgrading dependencies
+- Fix traceback when running tests with Python 2.6
+
+
 2.1.0 - 2013-10-26
 ------------------
 
@@ -14,6 +22,7 @@ CHANGES
 - Ignore .tox directories by default
 - Flake8 now reports the column number for PyFlakes messages
 
+
 2.0.0 - 2013-02-23
 ------------------
 
diff --git a/flake8/__init__.py b/flake8/__init__.py
index a33997d..e2c8842 100644
--- a/flake8/__init__.py
+++ b/flake8/__init__.py
@@ -1 +1 @@
-__version__ = '2.1.0'
+__version__ = '2.1.1a1'
diff --git a/setup.py b/setup.py
index a8f9f0e..7b7dc90 100644
--- a/setup.py
+++ b/setup.py
@@ -36,8 +36,8 @@ setup(
     url="http://bitbucket.org/tarek/flake8",
     packages=["flake8", "flake8.tests"],
     install_requires=[
-        "pyflakes >= 0.7.3",
-        "pep8 >= 1.4.6",
+        "pyflakes >= 0.8.1",
+        "pep8 >= 1.5.1",
         "mccabe >= 0.2.1",
     ],
     entry_points={