From f1ed74e06dfb6851bc691ebfd8135c875154ad50 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rapha=C3=ABl=20Barrois?= <raphael.barrois@polytechnique.org>
Date: Tue, 19 Apr 2016 22:54:36 +0200
Subject: Release version 2.7.0

---
 docs/changelog.rst  | 3 ++-
 factory/__init__.py | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index b1fd314..2341dfa 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -3,7 +3,7 @@ ChangeLog
 
 .. _v2.7.0:
 
-2.7.0 (2016-04-03)
+2.7.0 (2016-04-19)
 ------------------
 
 *New:*
@@ -11,6 +11,7 @@ ChangeLog
     - :issue:`267`: Add :class:`factory.LazyFunction` to remove unneeded lambada parameters,
       thanks to `Hervé Cauwelier <https://github.com/bors-ltd>`_.
     - :issue:`251`: Add :ref:`parameterized factories <parameters>` and :class:`traits <factory.Trait>`
+    - :issue:`256`, :issue:`292`: Improve error messages in corner cases
 
 *Removed:*
 
diff --git a/factory/__init__.py b/factory/__init__.py
index ad9da80..421e1ab 100644
--- a/factory/__init__.py
+++ b/factory/__init__.py
@@ -20,7 +20,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-__version__ = '2.6.1'
+__version__ = '2.7.0'
 __author__ = 'Raphaël Barrois <raphael.barrois+fboy@polytechnique.org>'
 
 
-- 
cgit v1.2.3