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

[tim.peters]

http://hg.python.org/cpython/rev/d2b03e3537bf
changeset:   85306:d2b03e3537bf
parent:      85303:89df1984adda
parent:      85305:a76564388a2b
user:        Tim Peters <tim at python.org>
date:        Wed Aug 21 18:55:56 2013 -0500
summary:
  Merge 3.3 into default.

The only file change is adding the v3.2.5 tag to the .hgtags file.

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


diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -101,6 +101,7 @@
 3d0686d90f55a78f96d9403da2c52dc2411419d0 v3.2.3
 b2cb7bc1edb8493c0a78f9331eae3e8fba6a881d v3.2.4rc1
 1e10bdeabe3de02f038a63c001911561ac1d13a7 v3.2.4
+cef745775b6583446572cffad704100983db2bea v3.2.5
 f1a9a6505731714f0e157453ff850e3b71615c45 v3.3.0a1
 2f69db52d6de306cdaef0a0cc00cc823fb350b01 v3.3.0a2
 0b53b70a40a00013505eb35e3660057b62be77be v3.3.0a3

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