# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@fb.com>
# Date 1427932042 25200
# Node ID ffa32ca659f1eb26e0f67e68f698837766819c3f
# Parent  c15d4677f2ba946c62387fe1ec27d383aa3274a9# Parent  5b6c42a3e12fc98e7b278eaee8923ecef5049dca
merge with stable

diff -r c15d4677f2ba -r ffa32ca659f1 .hgtags
--- a/.hgtags	Mon Mar 30 13:31:09 2015 -0700
+++ b/.hgtags	Wed Apr 01 16:47:22 2015 -0700
@@ -32,3 +32,4 @@
 dbd0733e584073d6a7b6dea933767853e9cfe845 5.0.2
 bfe9be352453640233371cc7deb409a09decacf9 5.1.0
 9b8628e0a142e0e094e27430c388e3c12ceba513 5.1.1
+e886bc501796d53e0a19e608c6e5a6071191819e 5.1.2
diff -r c15d4677f2ba -r ffa32ca659f1 README
--- a/README	Mon Mar 30 13:31:09 2015 -0700
+++ b/README	Wed Apr 01 16:47:22 2015 -0700
@@ -51,6 +51,10 @@
 Changelog
 =========
 
+5.1.2 -- 2015-04-01
+
+- evolve: prevent a crash in httpclient_pushobsmarkers() when pushing
+
 5.1.1 -- 2015-03-05
 
 - debugobsconvert: fix invalid markers during conversion
diff -r c15d4677f2ba -r ffa32ca659f1 hgext/evolve.py
--- a/hgext/evolve.py	Mon Mar 30 13:31:09 2015 -0700
+++ b/hgext/evolve.py	Wed Apr 01 16:47:22 2015 -0700
@@ -19,8 +19,8 @@
     - improves some aspect of the early implementation in Mercurial core
 '''
 
-__version__ = '5.1.1'
-testedwith = '3.3'
+__version__ = '5.1.2'
+testedwith = '3.3.3'
 buglink = 'http://bz.selenic.com/'
 
 import sys, os