[Python-checkins] cpython (merge default -> default): Merge.

[larry.hastings]

http://hg.python.org/cpython/rev/2c0999115fd3
changeset:   90765:2c0999115fd3
parent:      90757:ec3ca1901776
parent:      90763:61f92c6efa89
user:        Larry Hastings <larry at hastings.org>
date:        Sun May 18 23:20:45 2014 -0700
summary:
  Merge.

files:
  .hgtags |  2 ++
  1 files changed, 2 insertions(+), 0 deletions(-)


diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -134,3 +134,5 @@
 a300712ed38c9a242b736c44e806caea25a6dc05 v3.4.0rc2
 8a81cdab3e9d521daaef989fade94b16455fc3b8 v3.4.0rc3
 04f714765c13824c3bc2835d7b008908862e083a v3.4.0
+c67a19e11a7191baf30f313bf55e2e0b6c6f574e v3.4.1rc1
+c0e311e010fcb5bae8d87ca22051cd0845ea0ca0 v3.4.1

-- 
Repository URL: http://hg.python.org/cpython