]> granicus.if.org Git - python/commit
merge heads
authorBenjamin Peterson <benjamin@python.org>
Wed, 15 Oct 2014 17:40:34 +0000 (13:40 -0400)
committerBenjamin Peterson <benjamin@python.org>
Wed, 15 Oct 2014 17:40:34 +0000 (13:40 -0400)
commitc966103be6f6f8f647a3b07f79386701b29579cc
tree674bd2b0dffbfb237917d87c5bb63973bd1d2094
parent3f9f612b7ded1da1e91b5cddc198e6e281c215c0
parent7f314ed71b29c83bbfce6f11d9a7b3e42b78bf38
merge heads