commit | 831ae8454d6acc00c110e75f7a756cbfb071fe25 | [log] [tgz] |
---|---|---|
author | Georg Brandl <georg@python.org> | Sun May 12 11:24:47 2013 +0200 |
committer | Georg Brandl <georg@python.org> | Sun May 12 11:24:47 2013 +0200 |
tree | 24d868511731d47992b65ea5da5983f6d5970000 | |
parent | aa6f688bd4f02b5d50c26cf649172672c1546d12 [diff] | |
parent | 0d4931eb9e35a37ea8b116b408082326a80c16c2 [diff] |
merge heads