]> granicus.if.org Git - python/commitdiff
Putting the 3.2 -> default merge info in a happy place.
authorMeador Inge <meadori@gmail.com>
Mon, 23 Jul 2012 14:16:53 +0000 (09:16 -0500)
committerMeador Inge <meadori@gmail.com>
Mon, 23 Jul 2012 14:16:53 +0000 (09:16 -0500)

Trivial merge