diff options
author | Larry Hastings <larry@hastings.org> | 2014-05-18 23:20:45 -0700 |
---|---|---|
committer | Larry Hastings <larry@hastings.org> | 2014-05-18 23:20:45 -0700 |
commit | f87379063d69dff0fb264a8605dc1eb8b711851b (patch) | |
tree | 9c724720210c4b294a7d3b6c5da875efcbf703d1 | |
parent | 426d9958a234ad00203901209c6132821809d7c3 (diff) | |
parent | d98f686316f979f042c81317eaf0b5dddcf62254 (diff) | |
download | cpython-git-f87379063d69dff0fb264a8605dc1eb8b711851b.tar.gz |
Merge.
-rw-r--r-- | .hgtags | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -134,3 +134,5 @@ a97ce3ecc96af79bd2e1ac66ce48d9138e0ca749 v3.4.0b3 a300712ed38c9a242b736c44e806caea25a6dc05 v3.4.0rc2 8a81cdab3e9d521daaef989fade94b16455fc3b8 v3.4.0rc3 04f714765c13824c3bc2835d7b008908862e083a v3.4.0 +c67a19e11a7191baf30f313bf55e2e0b6c6f574e v3.4.1rc1 +c0e311e010fcb5bae8d87ca22051cd0845ea0ca0 v3.4.1 |