From 32da2ed7067e8cf1b66d05d676e6a2dac61d0cef Mon Sep 17 00:00:00 2001
From: Matthew Holt <Matthew.Holt+git@gmail.com>
Date: Mon, 3 Aug 2015 17:51:33 -0600
Subject: [PATCH] Updated change log

---
 dist/CHANGES.txt | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/dist/CHANGES.txt b/dist/CHANGES.txt
index 517421ac..34faa66a 100644
--- a/dist/CHANGES.txt
+++ b/dist/CHANGES.txt
@@ -1,5 +1,12 @@
 CHANGES
 
+<master>
+- fastcgi: Set HTTPS env variable if connection is secure
+- markdown: Fixed error reporting during initial site generation
+- markdown: Fixed crash if path does not exist when server starts
+- Several bug fixes related to startup and shutdown functions
+
+
 0.7.4 (July 30, 2015)
 - browse: Sorting preference persisted in cookie
 - browse: Added index.txt and default.txt to list of default files