| commit | 2533d88a9cd2fc04e8b90788c5f17daef0d09cf3 | [log] [tgz] |
|---|---|---|
| author | Benjamin Peterson <benjamin@python.org> | Wed May 06 21:32:14 2015 -0400 |
| committer | Benjamin Peterson <benjamin@python.org> | Wed May 06 21:32:14 2015 -0400 |
| tree | b83b9519608a587137005b68c6af7ac5bfba6074 | |
| parent | ec9b7728fe2f9314b2795573c1ffc12fe616900e [diff] | |
| parent | 7a04a89ec974c66d254b4b3039c2ef06fd7b3fd8 [diff] |
merge heads