commit | a1ff83e556856cf80c4df3bffc52a1b330adbfa1 | [log] [tgz] |
---|---|---|
author | Georg Brandl <georg@python.org> | Wed Oct 10 16:49:02 2012 +0200 |
committer | Georg Brandl <georg@python.org> | Wed Oct 10 16:49:02 2012 +0200 |
tree | 665692630936f038b479deda1712a68667e83e99 | |
parent | 5591b02a4c96c4b530ee024e6b1581f5ba72945d [diff] | |
parent | 3a2e101be564ffcb73dac708533d9178d90c2da8 [diff] |
merge 3.2 heads