| commit | f86d1fdab79cd6cab150fffecbc76388cb5b7f92 | [log] [tgz] |
|---|---|---|
| author | Benjamin Peterson <benjamin@python.org> | Mon Feb 02 10:52:56 2015 -0500 |
| committer | Benjamin Peterson <benjamin@python.org> | Mon Feb 02 10:52:56 2015 -0500 |
| tree | 2fac42729f6139812ed9d7798a898d8a04077d52 | |
| parent | 0e259f18f7ada32dd1a37ac883ea17df9c60bc53 [diff] | |
| parent | 7a66fc22ad62563d0907c2fc91229656acfa0dd6 [diff] |
merge 3.4 (#21295)