From 44b4c29d08fefd1b6bf158ded1e712c7a04b3d0d Mon Sep 17 00:00:00 2001
From: Christophe Romain <christophe.romain@process-one.net>
Date: Tue, 9 Dec 2008 00:35:27 +0000
Subject: [PATCH] lattest pubsub merge added in Changelog

SVN Revision: 1721
---
 ChangeLog | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index e703e7aa9..c5773945b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,10 @@
+2008-12-09  Christophe Romain <cromain@process-one.net>
+
+	* src/mod_pubsub: Mergr from lattest trunk (r1716).
+
 2008-12-08  Jean-Sébastien Pédron  <js.pedron@meetic-corp.com>
 
-	Merge from trunk (r1692 to r1709).
+	* src/mod_pubsub: Merge from trunk (r1692 to r1709).
 
 2008-12-08  Jean-Sébastien Pédron  <js.pedron@meetic-corp.com>