]> granicus.if.org Git - python/commit
merge heads
authorBenjamin Peterson <benjamin@python.org>
Mon, 29 Sep 2014 22:55:02 +0000 (18:55 -0400)
committerBenjamin Peterson <benjamin@python.org>
Mon, 29 Sep 2014 22:55:02 +0000 (18:55 -0400)
commitb2c432845c3f0e112487596c5538a0f099f51c7c
tree71d21c7cf5b25e103dc19896986c19b761be2c89
parentf114e5bccbd149176bdb7a0714a140a6238187fa
parent276a0a578e57eb565041ecb52d67147fd68e316c
merge heads