]> granicus.if.org Git - python/commit
merge heads
authorBenjamin Peterson <benjamin@python.org>
Tue, 12 Apr 2011 23:34:06 +0000 (18:34 -0500)
committerBenjamin Peterson <benjamin@python.org>
Tue, 12 Apr 2011 23:34:06 +0000 (18:34 -0500)
commitabdeeff3d1fa505fa1d49970cb7a70446f3e2b75
tree23131ed5d3928e8056f1cc28c6818b3ac43dd73a
parentbd3e362089c9fab1028a1bf58b4e762851a32244
parent26430419703f925a9b6206ec96780ae899b6dd06
merge heads