[pypy-commit] pypy default: merge heads

[mattip]

Author: Matti Picus <matti.picus at gmail.com>
Branch: 
Changeset: r86689:7ccea82f1b25
Date: 2016-08-29 21:50 +1000
http://bitbucket.org/pypy/pypy/changeset/7ccea82f1b25/

Log:	merge heads

diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -28,3 +28,5 @@
 c09c19272c990a0611b17569a0085ad1ab00c8ff release-pypy2.7-v5.3
 7e8df3df96417c16c2d55b41352ec82c9c69c978 release-pypy2.7-v5.3.1
 68bb3510d8212ae9efb687e12e58c09d29e74f87 release-pypy2.7-v5.4.0
+68bb3510d8212ae9efb687e12e58c09d29e74f87 release-pypy2.7-v5.4.0
+77392ad263504df011ccfcabf6a62e21d04086d0 release-pypy2.7-v5.4.0