summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2012-02-23 15:48:03 (GMT)
committerBenjamin Peterson <benjamin@python.org>2012-02-23 15:48:03 (GMT)
commitbff13be344131f2492acb891bb184abaf17a8e3a (patch)
treefb5d015f4aed64f3a16babd2dd7a144ed696930a
parentc09424255a5f1d9a108c14f974cfc55b2f4734f3 (diff)
parent31833d4728ec476e1af69f03ac5f412c47035cc4 (diff)
downloadcpython-bff13be344131f2492acb891bb184abaf17a8e3a.zip
cpython-bff13be344131f2492acb891bb184abaf17a8e3a.tar.gz
cpython-bff13be344131f2492acb891bb184abaf17a8e3a.tar.bz2
merge 3.1 (with 3.1.5rc1 release tag)
-rw-r--r--.hgtags1
1 files changed, 1 insertions, 0 deletions
diff --git a/.hgtags b/.hgtags
index 9ccde1e..7ac43b0 100644
--- a/.hgtags
+++ b/.hgtags
@@ -77,6 +77,7 @@ d18e9d71f369d8211f6ac87252c6d3211f9bd09f v3.1.3rc1
a4f75773c0060cee38b0bb651a7aba6f56b0e996 v3.1.3
32fcb9e94985cb19ce37ba9543f091c0dbe9d7dd v3.1.4rc1
c918ec9f3a76d6afedfbb5d455004de880443a3d v3.1.4
+ee26aca3219cf4bb0b93352e83edcc9cb28c7802 v3.1.5rc1
b37b7834757492d009b99cf0ca4d42d2153d7fac v3.2a1
56d4373cecb73c8b45126ba7b045b3c7b3f94b0b v3.2a2
da012d9a2c23d144e399d2e01a55b8a83ad94573 v3.2a3