# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@fb.com>
# Date 1435098767 25200
# Node ID 6db55f28c965b6cf555c78b308ff54c44e32e5f1
# Parent  ecd669c36c12134c558fae21a79b484daab2e5ab# Parent  e8f875227901ec9500c7196856a3b52febcd66e1
merge with stable

diff -r ecd669c36c12 -r 6db55f28c965 .hgtags
--- a/.hgtags	Tue Jun 23 00:00:03 2015 -0700
+++ b/.hgtags	Tue Jun 23 15:32:47 2015 -0700
@@ -35,3 +35,4 @@
 e886bc501796d53e0a19e608c6e5a6071191819e 5.1.2
 c52c15100fb2d85c3525d6d085b3663ec4f90fe6 5.1.3
 891c3ce894fa879532299910735bcc2a968245b1 5.1.4
+1377f6a7f9ecb25e9b8885fce8f6f42e0d6f3f12 5.1.5
diff -r ecd669c36c12 -r 6db55f28c965 README
--- a/README	Tue Jun 23 00:00:03 2015 -0700
+++ b/README	Tue Jun 23 15:32:47 2015 -0700
@@ -65,7 +65,7 @@
           descendant of the current working copy. The old behavior of `--all`
           in now in `--all --any`.
 
-5.1.5 --
+5.1.5 -- 2015-06-23
 
 - minor documentation cleanup
 - support -i option for `hg amend` if commit supports it (3.4)
diff -r ecd669c36c12 -r 6db55f28c965 debian/changelog
--- a/debian/changelog	Tue Jun 23 00:00:03 2015 -0700
+++ b/debian/changelog	Tue Jun 23 15:32:47 2015 -0700
@@ -1,3 +1,9 @@
+mercurial-evolve (5.1.5-1) UNRELEASED; urgency=medium
+
+  * New upstream release.
+
+ -- Pierre-Yves David <pyd@marginatus.alto.octopoid.net>  Tue, 23 Jun 2015 15:30:07 -0700
+
 mercurial-evolve (5.1.3-1) unstable; urgency=medium
 
   * new upstream release
diff -r ecd669c36c12 -r 6db55f28c965 hgext/evolve.py
--- a/hgext/evolve.py	Tue Jun 23 00:00:03 2015 -0700
+++ b/hgext/evolve.py	Tue Jun 23 15:32:47 2015 -0700
@@ -19,7 +19,7 @@
     - improves some aspect of the early implementation in Mercurial core
 '''
 
-__version__ = '5.1.4'
+__version__ = '5.1.5'
 testedwith = '3.3.3 3.4.1'
 buglink = 'http://bz.selenic.com/'
 
diff -r ecd669c36c12 -r 6db55f28c965 tests/test-evolve.t