commit | 1498461a7ada7688b347007aa2cc00b857899dff | [log] [tgz] |
---|---|---|
author | Benjamin Peterson <benjamin@python.org> | Sun Aug 30 14:42:49 2015 -0700 |
committer | Benjamin Peterson <benjamin@python.org> | Sun Aug 30 14:42:49 2015 -0700 |
tree | 3ba05faa66ac7fd37cf3fce88fdafff944274321 | |
parent | 9157545c1179045dda9d3c23961a971d838afa3a [diff] | |
parent | 0612ffe8c8a06f8d16d136622106f0cf5f43f90f [diff] |
merge 3.4 (#24963)