From 5ffb6dfcab5af89fc467eefbfceb6e192b97aa5b Mon Sep 17 00:00:00 2001
From: Guillaume Mazoyer <gmazoyer@gravitons.in>
Date: Tue, 16 Feb 2016 22:16:30 +0100
Subject: [PATCH] Release 1.2.0.

---
 CHANGELOG.md                 | 8 ++++++++
 includes/config.defaults.php | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 70246367..5b46ca08 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,13 @@
 # Changelog
 
+## Version 1.2.0 | Convergence (New features release) | 2016-02-16
+
+  * Second feature release of 1.X.Y branch
+  * New configuration options to customize ping and traceroute commands for
+    BIRD and Quagga
+  * Rework hostname parameter check
+  * Embeds Bootstrap 3.3.6, jQuery 2.2.0 and phpseclib 1.0.1
+
 ## Version 1.1.0 | Convergence (New features release) | 2014-12-23
 
   * First feature release of 1.X.Y branch
diff --git a/includes/config.defaults.php b/includes/config.defaults.php
index 0fbca1ac..9b7defec 100644
--- a/includes/config.defaults.php
+++ b/includes/config.defaults.php
@@ -28,7 +28,7 @@
 
   // Release configuration
   'release' => array(
-    'version' => '1.1.0',
+    'version' => '1.2.0',
     'codename' => 'Convergence'
   ),