# HG changeset patch
# User Marcin Kuzminski <marcin@python-works.com>
# Date 2012-01-28 17:42:00
# Node ID 2dca2f93f3e1b05312756dc44d894fba2057052c
# Parent  2ba965341189c0f1f0889f1bfa27b08320e304ca

changelog update

diff --git a/docs/changelog.rst b/docs/changelog.rst
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -4,6 +4,25 @@ Changelog
 =========
 
 
+1.2.5 (**2012-01-28**)
+======================
+
+news
+----
+
+fixes
+-----
+
+- #340 Celery complains about MySQL server gone away, added session cleanup
+  for celery tasks
+- #341 "scanning for repositories in None" log message during Rescan was missing
+  a parameter
+- fixed creating archives with subrepos. Some hooks were triggered during that
+  operation leading to crash.
+- fixed missing email in account page.
+- Reverted Mercurial to 2.0.1 for windows due to bug in Mercurial that makes
+  forking on windows impossible 
+
 1.2.4 (**2012-01-19**)
 ======================