]> granicus.if.org Git - python/commitdiff
Merge heads.
authorChris Jerdonek <chris.jerdonek@gmail.com>
Wed, 28 Nov 2012 10:46:25 +0000 (02:46 -0800)
committerChris Jerdonek <chris.jerdonek@gmail.com>
Wed, 28 Nov 2012 10:46:25 +0000 (02:46 -0800)

Trivial merge