add changelog entries for merge

diff --git a/ChangeLog b/ChangeLog
index 8bbc4f7a873944ff78a9935801c612f3c8e175d2..96b558cb004ae093753926cea73de482cad3ede1 100644 (file)
--- 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