From 6dfe66bce3a64089dba126f18e9ddbfb1cc55895 Mon Sep 17 00:00:00 2001
From: Sebastian McKenzie <sebmck@gmail.com>
Date: Tue, 11 Nov 2014 19:12:44 +1100
Subject: [PATCH] add v1.12.0 to changelog

---
 CHANGELOG.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 03988a3c7c..23882f2a59 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,8 @@
+# 1.12.0
+
+ * Combine `jsx` and `react` transformers to `react`.
+ * Update `react` syntax output to React v0.12.
+
 # 1.11.15
 
  * Fix JSX literal whitespace generation.