| commit | 65f7db3f59a7c0004ea2845e52680e75d9759698 | [log] [tgz] |
|---|---|---|
| author | Benjamin Peterson <benjamin@python.org> | Sun May 29 16:44:10 2011 -0500 |
| committer | Benjamin Peterson <benjamin@python.org> | Sun May 29 16:44:10 2011 -0500 |
| tree | 4cbccf5b25dadba4df8c7a465536572db6190b5a | |
| parent | d92ccb1f75ad5852e280c90354e5f547db649418 [diff] | |
| parent | 76450a96efb6ea60187c358edef218ef71a18ed9 [diff] |
merge 3.2
diff --git a/.hgtags b/.hgtags index c3a2c2c..407bbcb 100644 --- a/.hgtags +++ b/.hgtags
@@ -75,6 +75,7 @@ 960efa327c5d9c18df995437b0ac550cb89c9f85 v3.1.2 d18e9d71f369d8211f6ac87252c6d3211f9bd09f v3.1.3rc1 a4f75773c0060cee38b0bb651a7aba6f56b0e996 v3.1.3 +32fcb9e94985cb19ce37ba9543f091c0dbe9d7dd v3.1.4rc1 b37b7834757492d009b99cf0ca4d42d2153d7fac v3.2a1 56d4373cecb73c8b45126ba7b045b3c7b3f94b0b v3.2a2 da012d9a2c23d144e399d2e01a55b8a83ad94573 v3.2a3