From ce696c9b4ecc237b0ed89e71873e6f89f6aad449 Mon Sep 17 00:00:00 2001
From: Siu Kwan Lam <michael.lam.sk@gmail.com>
Date: Tue, 18 Feb 2014 14:30:26 -0600
Subject: [PATCH] Update changelog

---
 CHANGELOG | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index 0771ed9..48b5877 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,8 @@
 ---------------------
   * Fix deprecation message for py2.6
   * Fix llvm_cbuilder for using deprecated_alloca
+  * Merged PR #88 by cantora
+  * Merged PR #94 by cgohlke
 
 2014-02-04    0.12.2:
 ---------------------