]> granicus.if.org Git - python/commit
merge heads
authorBenjamin Peterson <benjamin@python.org>
Fri, 4 Jan 2013 04:34:40 +0000 (20:34 -0800)
committerBenjamin Peterson <benjamin@python.org>
Fri, 4 Jan 2013 04:34:40 +0000 (20:34 -0800)
commitd73f369f4c52e921ba225043c0a820856369ef44
tree4bc702b04312d48bc99c52c7621e15ef99f3c0ac
parent0a2c4f55c4d3288dce74513ef135fae167646f02
parentc44057dfbdb4e4f651e7cc4761aa63b7e8d128c3
merge heads