]> granicus.if.org Git - python/commitdiff
heads merging
authorJesus Cea <jcea@jcea.es>
Wed, 20 Apr 2011 19:11:52 +0000 (21:11 +0200)
committerJesus Cea <jcea@jcea.es>
Wed, 20 Apr 2011 19:11:52 +0000 (21:11 +0200)

Trivial merge