]> granicus.if.org Git - python/commit
merge heads
authorBenjamin Peterson <benjamin@python.org>
Sat, 28 May 2016 21:06:48 +0000 (14:06 -0700)
committerBenjamin Peterson <benjamin@python.org>
Sat, 28 May 2016 21:06:48 +0000 (14:06 -0700)
commitf558d5f284d531c058e229452154de5ebe003b1c
tree44779bfa9fd1ce6caf79d2d187e06eae2d0b5578
parent6ca426021904b7ec9548b64842eff107b0b8aeb8
parent6fa5bdc6e85ec48925bc0d856b134f59d01c300f
merge heads