]> granicus.if.org Git - python/commit
merge heads
authorBenjamin Peterson <benjamin@python.org>
Sun, 2 Sep 2012 18:25:18 +0000 (14:25 -0400)
committerBenjamin Peterson <benjamin@python.org>
Sun, 2 Sep 2012 18:25:18 +0000 (14:25 -0400)
commitf2f2bfee8af22385300b9dca1d10d1f26bc47034
tree895faddbbd2fc0326c1609f25997b98ec622ef83
parentc7f447c89fdef7106089f16ea46d5f9341fa0858
parent057119b0b77aec2956e6beb3de8a0690bca67644
merge heads