]> granicus.if.org Git - python/commit
merge heads
authorBenjamin Peterson <benjamin@python.org>
Wed, 19 Dec 2012 21:17:43 +0000 (15:17 -0600)
committerBenjamin Peterson <benjamin@python.org>
Wed, 19 Dec 2012 21:17:43 +0000 (15:17 -0600)
commitaf5e29a769c1db9c1dd24b6d7344b9c6e0f2713f
tree6736d74e912bb4cb0ced03e05a6faf90e17ce18a
parentfc8f5c5e0f7e004660cd72f889f21395cff9b1b1
parentfd43b4d3e4ef17f018e6da2d218c6ae193d6b45c
merge heads