summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2015-02-27 03:50:12 (GMT)
committerBenjamin Peterson <benjamin@python.org>2015-02-27 03:50:12 (GMT)
commit2bb5aa89d9da5d8f5635f974125c579e22ff8413 (patch)
treeac76b60165557d3cfadc78bd58d9f377089fb78d
parent76998fef2ced3dfbd62a3047f40312e3fff3ac26 (diff)
parentd2e067b130a8b67f1eb57ac3eab4e6a84fb5d854 (diff)
downloadcpython-2bb5aa89d9da5d8f5635f974125c579e22ff8413.zip
cpython-2bb5aa89d9da5d8f5635f974125c579e22ff8413.tar.gz
cpython-2bb5aa89d9da5d8f5635f974125c579e22ff8413.tar.bz2
merge 3.4
-rw-r--r--.hgtags1
1 files changed, 1 insertions, 0 deletions
diff --git a/.hgtags b/.hgtags
index a2caf77..31debc5 100644
--- a/.hgtags
+++ b/.hgtags
@@ -143,4 +143,5 @@ c0e311e010fcb5bae8d87ca22051cd0845ea0ca0 v3.4.1
8711a09513848cfc48c689d983495ee64f4668ca v3.4.2rc1
ab2c023a9432f16652e89c404bbc84aa91bf55af v3.4.2
69dd528ca6255a66c37cc5cf680e8357d108b036 v3.4.3rc1
+b4cbecbc0781e89a309d03b60a1f75f8499250e6 v3.4.3
5d4b6a57d5fd7564bf73f3db0e46fe5eeb00bcd8 v3.5.0a1