merge heads
authorBenjamin Peterson <benjamin@python.org>
Sat, 28 May 2016 21:07:45 +0000 (14:07 -0700)
committerBenjamin Peterson <benjamin@python.org>
Sat, 28 May 2016 21:07:45 +0000 (14:07 -0700)
commitdee9f7550406155dcb63db311b845fd0d2b67200
treed6ce10cc2f08b9a48b7cc415ce8241a2b4dea61b
parentf558d5f284d531c058e229452154de5ebe003b1c
parent46833e73af10de91f6e6fb5e3b39af56476aa39c
merge heads