| commit | 6b2308803506321019bfe2ec1f2303ebb97ec998 | [log] [tgz] |
|---|---|---|
| author | Benjamin Peterson <benjamin@python.org> | Mon Apr 14 12:16:18 2014 -0400 |
| committer | Benjamin Peterson <benjamin@python.org> | Mon Apr 14 12:16:18 2014 -0400 |
| tree | 8a44f937b69eaf29d0df4f233ba87d97053f39ea | |
| parent | 280c458f9ec3b7d5d1aa8e83c02af350a15ede8e [diff] | |
| parent | b814057cda86e42925095be1d005c737a09715a0 [diff] |
merge 3.4