# HG changeset patch
# User Marcin Kuzminski <marcin@python-works.com>
# Date 2011-02-26 23:38:28
# Node ID ecf25535131156ab4e8d1e7aef5f811ba184879a
# Parent  e6d6bd810e22e7d45766b367554fe36fdad5eb62

merge changelog with default (added 1.1.4 version)

diff --git a/docs/changelog.rst b/docs/changelog.rst
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -45,6 +45,19 @@ fixes
 - removed issue with space inside renamed repository after deletion
 - fixed strange issue on formencode imports
 
+1.1.4 (**2011-02-19**)
+======================
+
+news
+----
+
+fixes
+-----
+
+- fixed formencode import problem on settings page, that caused server crash
+  when that page was accessed as first after server start
+- journal fixes
+- fixed option to access repository just by entering http://server/<repo_name> 
 
 1.1.3 (**2011-02-16**)
 ======================