summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2011-06-11 15:01:35 (GMT)
committerBenjamin Peterson <benjamin@python.org>2011-06-11 15:01:35 (GMT)
commit5094eee2760c821bea041667dd99e5ce5309aca3 (patch)
tree70e6f502a0d83b47e93082afdf9d7861f9adb46a
parent89c00ce33a82b4ee6b91d802cfa7ba3e47a04bfa (diff)
parent98661d13d74fcffa4d77f0709d2123703e2ae106 (diff)
downloadcpython-5094eee2760c821bea041667dd99e5ce5309aca3.zip
cpython-5094eee2760c821bea041667dd99e5ce5309aca3.tar.gz
cpython-5094eee2760c821bea041667dd99e5ce5309aca3.tar.bz2
merge 3.2
-rw-r--r--.hgtags1
1 files changed, 1 insertions, 0 deletions
diff --git a/.hgtags b/.hgtags
index 407bbcb..c12bf22 100644
--- a/.hgtags
+++ b/.hgtags
@@ -76,6 +76,7 @@ a69a031ac1402dede8b1ef80096436bca6d371f3 v3.1
d18e9d71f369d8211f6ac87252c6d3211f9bd09f v3.1.3rc1
a4f75773c0060cee38b0bb651a7aba6f56b0e996 v3.1.3
32fcb9e94985cb19ce37ba9543f091c0dbe9d7dd v3.1.4rc1
+c918ec9f3a76d6afedfbb5d455004de880443a3d v3.1.4
b37b7834757492d009b99cf0ca4d42d2153d7fac v3.2a1
56d4373cecb73c8b45126ba7b045b3c7b3f94b0b v3.2a2
da012d9a2c23d144e399d2e01a55b8a83ad94573 v3.2a3