| commit | 27ee75f1913452d7325a1dac7302d402150639f8 | [log] [tgz] |
|---|---|---|
| author | Benjamin Peterson <benjamin@python.org> | Sat Nov 29 23:38:23 2014 -0500 |
| committer | Benjamin Peterson <benjamin@python.org> | Sat Nov 29 23:38:23 2014 -0500 |
| tree | 3b05111fcccee3203fe38e40397469fa34eabdb5 | |
| parent | e39bba2ab18db15e629f1738f0daf269de086724 [diff] | |
| parent | b7138e24e3359810158a88e285aae6f34e8d4255 [diff] |
merge 3.4