tree 7a004d8ec04426219edb9309306010793b1a1417
parent 239990daec1b4789c407ed022b5993f61d6e158e
author Benjamin Peterson <benjamin@python.org> 1381607645 -0400
committer Benjamin Peterson <benjamin@python.org> 1381607645 -0400
HG:extra amend_source:34ccb486fcf137814eec3423b5f4e4a622d70ce8

backport media types from default