]> granicus.if.org Git - python/commit
merge heads
authorBenjamin Peterson <benjamin@python.org>
Tue, 16 Oct 2012 13:52:02 +0000 (09:52 -0400)
committerBenjamin Peterson <benjamin@python.org>
Tue, 16 Oct 2012 13:52:02 +0000 (09:52 -0400)
commitba6a6cfbbc7359a871ef090f06ffeef1fb53e092
tree758dd05d0e28b41c9eabbca39d8a855722d21da7
parentbf67ba8f84f3e771193b44b25526d0258826052e
parentd86ceecf2141e684364d31c28941c6aacfbba47a
merge heads