]> granicus.if.org Git - python/commitdiff
Merge
authorJesus Cea <jcea@jcea.es>
Wed, 16 Mar 2011 00:40:50 +0000 (01:40 +0100)
committerJesus Cea <jcea@jcea.es>
Wed, 16 Mar 2011 00:40:50 +0000 (01:40 +0100)

Trivial merge