From 935bc0800399913269cffdda350479c29ab03e00 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <mitchell.hashimoto@gmail.com>
Date: Mon, 15 Dec 2014 15:36:07 -0800
Subject: [PATCH] update CHANGELOG

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4023ff326..a835a252b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,26 @@
+## 0.3.6 (unreleased)
+
+FEATURES:
+
+  * **New provider: `cloudstack`**
+
+IMPROVEMENTS:
+
+  * **New resource: `heroku_cert`** - Manage Heroku app certs.
+  * provider/aws: `route_table` can have tags. [GH-648]
+
+BUG FIXES:
+
+  * core: temporary/hidden files that look like Terraform configurations
+      are no longer loaded. [GH-548]
+  * core: Set types in resources now result in deterministic states,
+      resulting in cleaner plans. [GH-663]
+  * core: fix issue where "diff was not the same" would come up with
+      diffing lists. [GH-661]
+  * provider/aws: Fix crash case when internet gateway is not attached
+      to any VPC. [GH-664]
+  * provider/aws: `vpc_id` is no longer required. [GH-667]
+
 ## 0.3.5 (December 9, 2014)
 
 FEATURES: