[Python-checkins] cpython (merge 2.7 -> 2.7): merge 2.7.9 release branch

[benjamin.peterson]

https://hg.python.org/cpython/rev/6e1a825995e3
changeset:   93778:6e1a825995e3
branch:      2.7
parent:      93773:bf7d634ceb1b
parent:      93777:86095f76f654
user:        Benjamin Peterson <benjamin at python.org>
date:        Sun Dec 07 14:19:24 2014 -0500
summary:
  merge 2.7.9 release branch

files:
  Lib/test/data/README |  2 ++
  1 files changed, 2 insertions(+), 0 deletions(-)


diff --git a/Lib/test/data/README b/Lib/test/data/README
new file mode 100644
--- /dev/null
+++ b/Lib/test/data/README
@@ -0,0 +1,2 @@
+This empty directory serves as destination for temporary files
+created by some tests, in particular, the test_codecmaps_* tests.

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