From 1a319056fcc72e245a1cc4c7a942f18536e4d6ac Mon Sep 17 00:00:00 2001
From: Floris Bruynooghe <flub@devork.be>
Date: Sat, 6 Jul 2013 11:00:29 +0200
Subject: [PATCH] Mention issue 300 in changelog

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

diff --git a/CHANGELOG b/CHANGELOG
index a2a129fde..7c4c983d2 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,9 @@
 Changes between 2.3.5 and 2.4.DEV
 -----------------------------------
 
+- fix issue300 - Fix order of conftest loading when starting py.test
+  in a subdirectory.
+
 - fix issue323 - sorting of many module-scoped arg parametrizations
 
 - add support for setUpModule/tearDownModule detection, thanks Brian Okken.