From fea9a3837267684dfa8591e0a6e73538588d9d11 Mon Sep 17 00:00:00 2001
From: Nate Bird <natebird@gmail.com>
Date: Mon, 13 Oct 2014 07:42:05 -0400
Subject: [PATCH] Add 3.3.6 changes to Changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4c12b41f..49dbb5b3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,19 @@ master
 
 * Update new project template Gemfile to use HTTPS by default. #1372
 
+3.3.6
+===
+
+* Use full paths instead of relative for `listen` gem. Fixes #1374
+* Add force option to "middleman init". #1369
+* Configuration addition for compass 1 compatibility.
+* Catch File read exceptions in frontmatter.
+* Remove duplicate attr_accessor. Closes #1352
+* Update sass dependency to >= 3.4.0.
+* Update compass dependency to >= 1.0.0, < 2.0.0
+* Accept pandoc-style YAML frontmatter. #1350
+* Add webp to image type lists.
+
 3.3.5
 ===