| commit | f1a3240ba86408a2cdb88a2bfa38a2dce1f4ed9c | [log] [tgz] |
|---|---|---|
| author | Benjamin Peterson <benjamin@python.org> | Sun Nov 23 11:43:43 2014 -0600 |
| committer | Benjamin Peterson <benjamin@python.org> | Sun Nov 23 11:43:43 2014 -0600 |
| tree | f431cb97afb423edef27e4c357205d9fdacc938d | |
| parent | d3c53b6048b156d358bc0729b6e0ede3fc4a5516 [diff] | |
| parent | 378e15d7abedb4a1990230d5e3c74d2390be96c4 [diff] |
merge 3.4