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