From 412b56f7cf1f8d51eb155e198ba460feb1e904d1 Mon Sep 17 00:00:00 2001
From: Floris Bruynooghe <flub@devork.be>
Date: Mon, 14 Apr 2014 18:12:29 -0400
Subject: [PATCH] Changelog for issue 475

---
 CHANGELOG | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index b837d0a69..89737dd73 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,9 @@
 NEXT (2.6)
 -----------------------------------
 
+- fix issue 475: fail early and comprehensible if calling
+  pytest.raises with wrong exception type.
+
 - change XPASS colour to yellow rather then red when tests are run
   with -v.