From 107e3c1519834ed69936a533df4c4a0d59c8bd14 Mon Sep 17 00:00:00 2001
From: Christian Weiske <cweiske@cweiske.de>
Date: Wed, 22 Aug 2012 21:46:22 +0200
Subject: [PATCH] add changelog entries for merge

---
 ChangeLog | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 8bbc4f7..96b558c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-08-22  Stephen Lang  <info@skl.me>
+
+	* Added nginx rewrite rules to README
+	* Fixed bug where autodetect fails, wrong default set.
+
 2012-06-06  Christian Weiske  <cweiske@cweiske.de>
 
 	* Hide additional file fields by default, button to toggle their
-- 
2.30.2