commit | 285e2e8403fb71e305146dc5cc98ad2d350cbaad | [log] [tgz] |
---|---|---|
author | Benjamin Peterson <benjamin@python.org> | Tue Oct 29 18:18:52 2013 -0400 |
committer | Benjamin Peterson <benjamin@python.org> | Tue Oct 29 18:18:52 2013 -0400 |
tree | 166f15fc7b7fc24c41b354589d46e0ff81d600c5 | |
parent | db78e4365b0e497f955c974d1d8569dccca1a64f [diff] | |
parent | 21376cfdee02a4fdddbcbb46cd1abc1bcb2bb5c2 [diff] |
merge 2.7.6 branch