# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@octobus.net>
# Date 1500994711 -7200
# Node ID fb795bdaa06c2209de29ff649752568bea27876b
# Parent  ed584b6b3f6e43807ac9f7f03e73892e5fd45e9e# Parent  ec2beb920341d4582c93e959a5af3bd5304403be
branching: merge with stable

diff -r ed584b6b3f6e -r fb795bdaa06c hgext3rd/evolve/metadata.py
--- a/hgext3rd/evolve/metadata.py	Tue Jul 25 16:58:04 2017 +0200
+++ b/hgext3rd/evolve/metadata.py	Tue Jul 25 16:58:31 2017 +0200
@@ -5,7 +5,7 @@
 # This software may be used and distributed according to the terms of the
 # GNU General Public License version 2 or any later version.
 
-__version__ = '6.6.1.dev'
+__version__ = '6.7.0.dev'
 testedwith = '3.8.4 3.9.2 4.0.2 4.1.3 4.2.2'
 minimumhgversion = '3.8'
 buglink = 'https://bz.mercurial-scm.org/'
diff -r ed584b6b3f6e -r fb795bdaa06c hgext3rd/topic/__init__.py
--- a/hgext3rd/topic/__init__.py	Tue Jul 25 16:58:04 2017 +0200
+++ b/hgext3rd/topic/__init__.py	Tue Jul 25 16:58:31 2017 +0200
@@ -118,7 +118,7 @@
               'topic.active': 'green',
              }
 
-version = '0.2.1.dev'
+version = '0.3.0.dev'
 testedwith = '4.0.2 4.1.3 4.2.1'
 minimumhgversion = '4.0'
 buglink = 'https://bz.mercurial-scm.org/'