From bd776152db4f05ba13a58795f2eae0fc98b4e9cb Mon Sep 17 00:00:00 2001
From: Francis Lachapelle <flachapelle@inverse.ca>
Date: Tue, 23 Jul 2013 10:02:13 -0400
Subject: [PATCH] Update ChangeLog

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

diff --git a/ChangeLog b/ChangeLog
index a0f39423b..8eda0e0db 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,20 @@
+commit 734c164ae02df4e2313003d143486eff67f42c5e
+Author: Ludovic Marcotte <lmarcotte@inverse.ca>
+Date:   Tue Jul 23 09:25:24 2013 -0400
+
+    Reverted broken patch in #2360 and tried to fix it cleanly
+
+M	UI/MailPartViewers/GNUmakefile
+M	UI/MailerUI/GNUmakefile
+
+commit 9f381e768dfd6548da4a88de370818ba6abb3314
+Author: Francis Lachapelle <flachapelle@inverse.ca>
+Date:   Tue Jul 23 08:38:09 2013 -0400
+
+    Update ChangeLog
+
+M	ChangeLog
+
 commit b531b6160c5ecc41f7160195da1b449dc87d01e3
 Author: Ludovic Marcotte <lmarcotte@inverse.ca>
 Date:   Tue Jul 23 08:31:38 2013 -0400