From 4937f78baebacf4269c4942103a4a138e19ef331 Mon Sep 17 00:00:00 2001
From: x2000habouzit <x2000habouzit@839d8a87-29fc-0310-9880-83ba4fa771e5>
Date: Sun, 30 Jul 2006 21:59:53 +0000
Subject: [PATCH] fru's work and mine of tonight deserve a changelog entry

git-svn-id: svn+ssh://murphy/home/svn/platal/trunk@741 839d8a87-29fc-0310-9880-83ba4fa771e5
---
 ChangeLog | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 05ebe8a..2a07b85 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -19,12 +19,14 @@ New:
     * Core:
         - Work hard to add nice URI's into Platal.                          -MC
         - Use fancy icons from http://www.famfamfam.com/ for flags.         -MC
+        - Merge htdocs/htdocs.net using apache tricks, share more code.     -MC
 
     * Emails:
         - Switch to the new URI scheme.                                     -MC
 
     * Events:
         - Switch to the new URI scheme.                                 -MC/FRU
+        - Rework Events administration interface.                          -FRU
 
     * Geoloc:
         - Switch to the new URI scheme.                                 -MC/Car
@@ -87,6 +89,7 @@ Bug/Wish:
 
     * Core:
         - #371: Users can send bugs directly to plat/al tracker.           -Car
+
     * Emails:
         - #426: Add an identification header in mails.                     -FRU
 
-- 
2.1.4