]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge
authorRaymond Hettinger <python@rcn.com>
Fri, 17 May 2013 09:24:18 +0000 (02:24 -0700)
committerRaymond Hettinger <python@rcn.com>
Fri, 17 May 2013 09:24:18 +0000 (02:24 -0700)
1  2 
.hgignore

diff --cc .hgignore
Simple merge