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

[raymond.hettinger]

http://hg.python.org/cpython/rev/9ff8b6d4d479
changeset:   83809:9ff8b6d4d479
parent:      83807:6707637f68ca
parent:      83808:86c2dcb2e0df
user:        Raymond Hettinger <python at rcn.com>
date:        Fri May 17 02:24:18 2013 -0700
summary:
  merge

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


diff --git a/.hgignore b/.hgignore
--- a/.hgignore
+++ b/.hgignore
@@ -1,7 +1,7 @@
 .gdb_history
 .purify
 .svn/
-DS_Store
+.DS_Store
 Makefile$
 Makefile.pre$
 TAGS$

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