From 93089108932a5382630243a5691d4cf796b60ec4 Mon Sep 17 00:00:00 2001
From: Ian Cordasco <graffatcolmingov@gmail.com>
Date: Sat, 25 Jun 2016 11:37:24 -0500
Subject: [PATCH] Bump version for 2.6.1

---
 CHANGES.rst        | 7 +++++++
 flake8/__init__.py | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index d24840f..ad3d2c3 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,6 +1,13 @@
 CHANGES
 =======
 
+2.6.1 - 2016-06-25
+------------------
+
+- **Bug** Update the config files to search for to include ``setup.cfg`` and
+  ``tox.ini``. This was broken in 2.5.5 when we stopped passing
+  ``config_file`` to our Style Guide
+
 2.6.0 - 2016-06-15
 ------------------
 
diff --git a/flake8/__init__.py b/flake8/__init__.py
index f0e5e1e..574f407 100644
--- a/flake8/__init__.py
+++ b/flake8/__init__.py
@@ -1 +1 @@
-__version__ = '2.6.0'
+__version__ = '2.6.1'