| commit | 758d60baaa3c041d0982c84d514719ab197bd6ed | [log] [tgz] |
|---|---|---|
| author | Benjamin Peterson <benjamin@python.org> | Sat Jun 27 14:26:21 2015 -0500 |
| committer | Benjamin Peterson <benjamin@python.org> | Sat Jun 27 14:26:21 2015 -0500 |
| tree | 294c77e4a348d4f51bbe26487fb1c83589f182c7 | |
| parent | 7763c68dcd8ac6fa3e7d24197ea1fae614eaacb2 [diff] | |
| parent | acac1e0e3bf564fbad2107d8f50d7e9c42e5ef22 [diff] |
merge 3.4