From 4c86ed7535618c824afc9719429ef59be5715889 Mon Sep 17 00:00:00 2001
From: Damien Churchill <damoc@gmail.com>
Date: Mon, 2 Nov 2009 15:35:56 +0000
Subject: [PATCH] forward port the setup.py fix to trunk and update the 1.2
 branch ChangeLog

---
 ChangeLog | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 1c97f4127..2da4107de 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+=== Deluge 1.2.0_rc4 (In Development) ===
+==== Web ====
+	* Fix installing the deluge-web manpage
+
 === Deluge 1.2.0_rc3 (01 November 2009) ===
 ==== Core ====
 	* Fix #1047 move completed does not work if saving to non default path