From ae9363ff4a7f0e17dee17e8d967a7391d788f550 Mon Sep 17 00:00:00 2001
From: Fabien Potencier <fabien.potencier@gmail.com>
Date: Thu, 4 Jun 2015 23:23:30 +0200
Subject: [PATCH] updated CHANGELOG

---
 doc/changelog.rst | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/doc/changelog.rst b/doc/changelog.rst
index 7dec240e..a721aafc 100644
--- a/doc/changelog.rst
+++ b/doc/changelog.rst
@@ -1,6 +1,11 @@
 Changelog
 =========
 
+1.2.5 (2015-06-04)
+------------------
+
+* no code changes (last version of the 1.2 branch)
+
 1.2.4 (2015-04-11)
 ------------------
 
-- 
GitLab