commit | f1acd0ab381b4e50b8f1a3cd0186ff1551c81b06 | [log] [tgz] |
---|---|---|
author | Benjamin Peterson <benjamin@python.org> | Thu Mar 15 13:01:04 2012 -0500 |
committer | Benjamin Peterson <benjamin@python.org> | Thu Mar 15 13:01:04 2012 -0500 |
tree | a4a8218cb009a89157c51ed42e88ab4b2c0be7b5 | |
parent | 32a3b147b24847702c2fc7e7cf030b5f34921c2b [diff] | |
parent | bf6bf4f8f2ca83ed60ef36c768deddea336f468c [diff] |
merge from 2.7 release branch