From ad141295ed37c869108515a1540e81ad6c24bd8f Mon Sep 17 00:00:00 2001
From: Francis Lachapelle <flachapelle@inverse.ca>
Date: Mon, 18 Jan 2016 09:55:36 -0500
Subject: [PATCH] Update ChangeLog

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

diff --git a/ChangeLog b/ChangeLog
index 4b86cf703..d568cd4b3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,22 @@
+commit 5fef815191d73e7015e31d4d2d324ab3ff4853d8
+Author: Francis Lachapelle <flachapelle@inverse.ca>
+Date:   Mon Jan 18 09:55:21 2016 -0500
+
+    Preparation for release 2.3.6
+
+M	Documentation/docinfo.xml
+M	Documentation/includes/global-attributes.asciidoc
+M	NEWS
+M	Version
+
+commit ec28fdc8d0620a425e9065b208b2b72dc55bf191
+Author: Francis Lachapelle <flachapelle@inverse.ca>
+Date:   Mon Jan 18 09:51:58 2016 -0500
+
+    Update ChangeLog
+
+M	ChangeLog
+
 commit b1590f6b2e01ac697597018871f7953f992226f9
 Author: Francis Lachapelle <flachapelle@inverse.ca>
 Date:   Mon Jan 18 09:51:22 2016 -0500