[Python-checkins] cpython (merge 2.7 -> 2.7): Merge heads

[zach.ware]

https://hg.python.org/cpython/rev/44099527b5a1
changeset:   95569:44099527b5a1
branch:      2.7
parent:      95568:069dd1e347b4
parent:      95560:dc8921e1fe14
user:        Zachary Ware <zachary.ware at gmail.com>
date:        Mon Apr 13 10:49:43 2015 -0500
summary:
  Merge heads

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


diff --git a/.gitignore b/.gitignore
--- a/.gitignore
+++ b/.gitignore
@@ -38,7 +38,7 @@
 libpython*.a
 libpython*.so*
 pyconfig.h
-python
+python$
 python-gdb.py
 tags
 .coverage

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