From 87cf141c8953bdce2e99c12828748164735f16df Mon Sep 17 00:00:00 2001
From: =?utf8?q?St=C3=A9phane=20Jacob?= <jacou@melix.net>
Date: Wed, 20 Aug 2008 23:20:16 +0200
Subject: [PATCH] Updates ChangeLog.

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

diff --git a/ChangeLog b/ChangeLog
index ae3c74f..283a961 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,17 @@
 ================================================================================
+VERSION FUSION DES ANNUAIRES                                          XX XX XXXX
+
+New:
+    * Profile:
+        - Centralises email management through an email combobox           -JAC
+        - Adds the directory email                                         -JAC
+
+Bug/Wish:
+    * Profile:
+        - #386: Adds the possibility to fill in multiple nationalities     -JAC
+        - #209: Thoroughly changes education's implementation              -JAC
+
+================================================================================
 VERSION 0.9.18                                                        XX XX XXXX
 
 Bug/Wish:
@@ -1261,7 +1274,9 @@ ACRONYMS:
     * CAT: Florian El Ahdab     (LeChat)    <florian.el-ahdab@m4x.org>
     * FAL: Raphaël Marichez     (Falco)     <raphael.marichez@m4x.org>
     * FRU: Florent Bruneau      (Fruneau)   <florent.bruneau@m4x.org>
+    * GUI: Guillaume Bandet     (GUI)       <guillaume.bandet@m4x.org>
     * JAC: Stéphane Jacob       (jacou)     <stephane.jacob@m4x.org>
+    * JM : Jean-Marc Bécu                   <jean-marc.becu@m4x.org>
     * JS : Jean Sébastien Bedo              <jean-sebastien.bedo@m4x.org>
     * MC : Pierre Habouzit      (MadCoder)  <pierre.habouzit@m4x.org>
     * mYk: Aymeric Augustin     (mYk)       <aymeric.augustin@m4x.org>
-- 
2.1.4