From 96e2b21ef7bfa810d5da2cac86019b041ded8193 Mon Sep 17 00:00:00 2001
From: "chris.boulton" <chris.boulton@interspire.com>
Date: Tue, 14 Jun 2011 19:29:43 +1000
Subject: [PATCH] Update changelog to mention bug fix by andrewjshults

---
 CHANGELOG.markdown | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG.markdown b/CHANGELOG.markdown
index a4b2af2..97a9581 100644
--- a/CHANGELOG.markdown
+++ b/CHANGELOG.markdown
@@ -1,3 +1,7 @@
+## 1.2 (Unreleased) ##
+
+* Use `require_once` when including php-resque after the app has been included in the sample resque.php to prevent include conflicts (andrewjshults)
+
 ## 1.1 (2011-03-27) ##
 
 * Update Redisent library for Redis 2.2 compatibility. Redis 2.2 is now required. (thedotedge)