summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLarry Hastings <larry@hastings.org>2017-01-03 02:36:52 (GMT)
committerLarry Hastings <larry@hastings.org>2017-01-03 02:36:52 (GMT)
commitd9cb1b0c2d25ac1e368580a14803847688183518 (patch)
treef8ecd54be2557f7f3711fb537184d4a0d87b8a9f
parent31f9d9d340a78c606927ecb33420c4d8299954ec (diff)
parentaa772e3cd205abc8c843f0ac0265b826911f49df (diff)
downloadcpython-d9cb1b0c2d25ac1e368580a14803847688183518.zip
cpython-d9cb1b0c2d25ac1e368580a14803847688183518.tar.gz
cpython-d9cb1b0c2d25ac1e368580a14803847688183518.tar.bz2
Forward-merge from 3.4.
-rw-r--r--.hgtags1
1 files changed, 1 insertions, 0 deletions
diff --git a/.hgtags b/.hgtags
index c75eb7c..ad14c02 100644
--- a/.hgtags
+++ b/.hgtags
@@ -148,6 +148,7 @@ b4cbecbc0781e89a309d03b60a1f75f8499250e6 v3.4.3
737efcadf5a678b184e0fa431aae11276bf06648 v3.4.4
3631bb4a2490292ebf81d3e947ae36da145da564 v3.4.5rc1
619b61e505d0e2ccc8516b366e4ddd1971b46a6f v3.4.5
+e199a272ccdac5a8c073d4690f60c13e0b6d86b0 v3.4.6rc1
5d4b6a57d5fd7564bf73f3db0e46fe5eeb00bcd8 v3.5.0a1
0337bd7ebcb6559d69679bc7025059ad1ce4f432 v3.5.0a2
82656e28b5e5c4ae48d8dd8b5f0d7968908a82b6 v3.5.0a3