From d67514b6575df3386cd8c925c996a96d048a7d62 Mon Sep 17 00:00:00 2001
From: Floris Bruynooghe <flub@devork.be>
Date: Thu, 21 Nov 2013 01:37:48 +0000
Subject: [PATCH] Fixup changelog

This seems to have gone wrong in the merge.
---
 CHANGELOG | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index 2262a33f9..9fde3fbb4 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -4,6 +4,7 @@ Unreleased
 - fix issue287 by running all finalizers but saving the exception
   from the last failing finalizer and re-raising it so teardown will
   still have failed.
+
 - fix ordering when mock.patch or other standard decorator-wrappings
   are used with test methods.  This fixues issue346.  Thanks to
   Ronny Pfannschmidt and Donald Stufft for helping to isolate it.
@@ -59,6 +60,9 @@ Unreleased
   although it's not needed by pytest itself atm.  Also
   fix caching.  Fixes issue376.
 
+- fix issue221 - handle importing of namespace-package with no 
+  __init__.py properly.
+
 Changes between 2.4.1 and 2.4.2
 -----------------------------------