boto/botocore — pull request #192 by jamesls (2013-12-18 17:56:44+00:00)
Title: Parse JSON response based on the service type, not content type

Fixes issue #136 as well as fixes aws/aws-cli#553.