]> granicus.if.org Git - python/commit
merge heads
authorBenjamin Peterson <benjamin@python.org>
Mon, 2 Mar 2015 18:24:21 +0000 (13:24 -0500)
committerBenjamin Peterson <benjamin@python.org>
Mon, 2 Mar 2015 18:24:21 +0000 (13:24 -0500)
commit241520ad1038e20554f420e83c65694c5e3fa36a
tree90ecb28fe70e8d15bc7c181449c6844fd2d7f1c0
parent6c0a82038dcefb35d0421ca1da9b11b2219a39d4
parent42fc0eb82712b1aa2890e5ee1c22be0bb7ddd83a
merge heads