Merge. v3.2.3
authorGeorg Brandl <georg@python.org>
Tue, 10 Apr 2012 17:30:22 +0000 (19:30 +0200)
committerGeorg Brandl <georg@python.org>
Tue, 10 Apr 2012 17:30:22 +0000 (19:30 +0200)
commit81c393b3ded977375d35297b3d47b47014b2391a
tree019a61deb1e295a43eb3d932b60f036dceb14f15
parent44036016b9ac8c1ceeb2a634585513ccb674c571
parenta7f6b14fa6c7ebe402a62cd425fb7aeb007080a3
Merge.