]> granicus.if.org Git - python/commit
merge heads
authorBenjamin Peterson <benjamin@python.org>
Thu, 15 Mar 2012 20:38:17 +0000 (15:38 -0500)
committerBenjamin Peterson <benjamin@python.org>
Thu, 15 Mar 2012 20:38:17 +0000 (15:38 -0500)
commit5e259c80947513c564d7a9e2b6f8b47a69f61d14
tree0bf586fc47e8c30da94b5fdce8e71d8e71255c23
parentf50af113ab1bd6e435167e94c42498a8d20895c2
parentca2f6ecfc99ec7f0467e3c6c980fffd5ab64d9f0
merge heads