commit | 2bff9fcec23798dd192932842bae9855ed47a862 | [log] [tgz] |
---|---|---|
author | Georg Brandl <georg@python.org> | Sun May 15 10:42:56 2011 +0200 |
committer | Georg Brandl <georg@python.org> | Sun May 15 10:42:56 2011 +0200 |
tree | 075db2aae158618d22b8e9627b560a38a65f8ef8 | |
parent | 758b85e9d4cf714a92b6d4032c3cf00308539810 [diff] | |
parent | 5ebfe6d9a96beaa190e803259ffd05abe8786e14 [diff] |
Branch merge.