From: Meador Inge <meadori@gmail.com>
Date: Mon, 23 Jul 2012 14:16:53 +0000 (-0500)
Subject: Putting the 3.2 -> default merge info in a happy place.
X-Git-Tag: v3.3.0b2~120
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=fe114f0293bde5e213211a6658644144f7df94b9;p=thirdparty%2FPython%2Fcpython.git

Putting the 3.2 -> default merge info in a happy place.
---

fe114f0293bde5e213211a6658644144f7df94b9