From b68f8050c78867351f3e6340e1348c9c340d8ca4 Mon Sep 17 00:00:00 2001
From: Ask Solem <ask@celeryproject.org>
Date: Fri, 16 Aug 2013 15:33:57 +0100
Subject: Updates Changelog

---
 Changelog | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/Changelog b/Changelog
index 72a1f69b..0c293639 100644
--- a/Changelog
+++ b/Changelog
@@ -12,6 +12,15 @@
 
 - Now depends on :mod:`amqp` 1.0.13
 
+- Fixed typo in Django functional tests.
+
+- safe_str now returns unicode in Python 2.x
+
+    Fix contributed by Germán M. Bravo.
+
+- amqp: Transport options are now merged with arguments
+  supplied to the connection.
+
 .. _version-2.5.12:
 
 2.5.12
-- 
cgit v1.2.1