# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@octobus.net>
# Date 1510876149 -3600
# Node ID c78c3d2283c6994ed3bcad50e5685af8e513b787
# Parent  390c87f8c65d92f09ea647c804de9bc2c6e0372b# Parent  f33768dd2422f36468706e6969b4116153a8cc08
branching: merge with stable

diff -r 390c87f8c65d -r c78c3d2283c6 CHANGELOG
--- a/CHANGELOG	Thu Nov 16 11:38:33 2017 -0800
+++ b/CHANGELOG	Fri Nov 17 00:49:09 2017 +0100
@@ -1,7 +1,7 @@
 Changelog
 =========
 
-7.0.1 - in progress
+7.0.1 -- 2017-11-14
 -------------------
 
   * obsdiscovery: allow the config option to disable discovery server side