summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNed Deily <nad@python.org>2016-12-17 03:56:48 (GMT)
committerNed Deily <nad@python.org>2016-12-17 03:56:48 (GMT)
commit06f9d48c99a33e021025a7cd7e17e709713da730 (patch)
tree42aa0d9748b37d5bbb3b44d9b99aec7c989913a8
parentb2d4b3d41570f745d2c6590b85c9d4b1f67fa241 (diff)
parent40ed60283604fb1b782f235149202c8376f9f6a7 (diff)
downloadcpython-06f9d48c99a33e021025a7cd7e17e709713da730.zip
cpython-06f9d48c99a33e021025a7cd7e17e709713da730.tar.gz
cpython-06f9d48c99a33e021025a7cd7e17e709713da730.tar.bz2
Null merge from 3.6
-rw-r--r--.hgtags1
1 files changed, 1 insertions, 0 deletions
diff --git a/.hgtags b/.hgtags
index 2c4a2c7..f49b483 100644
--- a/.hgtags
+++ b/.hgtags
@@ -175,3 +175,4 @@ b9fadc7d1c3f9c3c77f32f35afbe1a1cc38070e6 v3.6.0b2
8345e066c0ed713c3e510cbc8fafc1c38d6d306b v3.6.0b3
18496abdb3d5c2730a659b747a89261b2219fecf v3.6.0b4
29a273eee9a523ee178f6a66c4ac9d317c8fc84f v3.6.0rc1
+800a67f7806de45a7abd5273359e704bf147c079 v3.6.0rc2