diff options
| author | Benjamin Peterson <benjamin@python.org> | 2012-04-06 17:20:16 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2012-04-06 17:20:16 (GMT) |
| commit | 161aece9d3574c22d2585687db5cd4f33a76f052 (patch) | |
| tree | 818da3e14de13686b5512610bfdce12b089f2470 | |
| parent | 83c02ee8e8d62dbdd1576f2d02a7925b4381cc02 (diff) | |
| parent | dcb89f4f09c9d0d2fcca412db726f43a0268efce (diff) | |
| download | cpython-161aece9d3574c22d2585687db5cd4f33a76f052.zip cpython-161aece9d3574c22d2585687db5cd4f33a76f052.tar.gz cpython-161aece9d3574c22d2585687db5cd4f33a76f052.tar.bz2 | |
merge 3.2
| -rw-r--r-- | .hgtags | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -78,6 +78,8 @@ a4f75773c0060cee38b0bb651a7aba6f56b0e996 v3.1.3 32fcb9e94985cb19ce37ba9543f091c0dbe9d7dd v3.1.4rc1 c918ec9f3a76d6afedfbb5d455004de880443a3d v3.1.4 ee26aca3219cf4bb0b93352e83edcc9cb28c7802 v3.1.5rc1 +75db2bc69fc9a3e4801e94e3e19801cb096208d8 v3.1.5rc2 +7395330e495ec3316862ca1f6ce0aaf7bdf6785b v3.1.5 b37b7834757492d009b99cf0ca4d42d2153d7fac v3.2a1 56d4373cecb73c8b45126ba7b045b3c7b3f94b0b v3.2a2 da012d9a2c23d144e399d2e01a55b8a83ad94573 v3.2a3 |