summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2012-04-06 17:19:52 (GMT)
committerBenjamin Peterson <benjamin@python.org>2012-04-06 17:19:52 (GMT)
commit718a8e81407f599b8ab9c9ac4dd2fdae1806184a (patch)
tree0f92798c4507a14cbd1424b4d3ad1a8259375f78
parent80d50428ce7697cc2f1fdb4370800b89399c4cda (diff)
parent7fddb4b2f650208b9667f000b37603ee651c58e7 (diff)
downloadcpython-718a8e81407f599b8ab9c9ac4dd2fdae1806184a.zip
cpython-718a8e81407f599b8ab9c9ac4dd2fdae1806184a.tar.gz
cpython-718a8e81407f599b8ab9c9ac4dd2fdae1806184a.tar.bz2
merge 3.1
-rw-r--r--.hgtags1
1 files changed, 1 insertions, 0 deletions
diff --git a/.hgtags b/.hgtags
index 87582aa..ac0b0a4 100644
--- a/.hgtags
+++ b/.hgtags
@@ -78,6 +78,7 @@ a4f75773c0060cee38b0bb651a7aba6f56b0e996 v3.1.3
32fcb9e94985cb19ce37ba9543f091c0dbe9d7dd v3.1.4rc1
c918ec9f3a76d6afedfbb5d455004de880443a3d v3.1.4
ee26aca3219cf4bb0b93352e83edcc9cb28c7802 v3.1.5rc1
+7395330e495ec3316862ca1f6ce0aaf7bdf6785b v3.1.5
b37b7834757492d009b99cf0ca4d42d2153d7fac v3.2a1
56d4373cecb73c8b45126ba7b045b3c7b3f94b0b v3.2a2
da012d9a2c23d144e399d2e01a55b8a83ad94573 v3.2a3