]> granicus.if.org Git - python/commit
Merge.
authorRichard Oudkerk <shibturn@gmail.com>
Sat, 18 May 2013 17:13:16 +0000 (18:13 +0100)
committerRichard Oudkerk <shibturn@gmail.com>
Sat, 18 May 2013 17:13:16 +0000 (18:13 +0100)
commit850800f15ef3cfa51dfafbc41a1bb574fb542ded
treed9d991dfe4fe10786757997c47a2cf0072017476
parent25296ce5de6501ac3eb3ed2631288b63c3ad61c7
parent90a24270f8a76fffbce0a09fb0e879d9ac60cabe
Merge.