From: Kenneth Reitz <me@kennethreitz.org>
Date: Tue, 27 May 2014 15:25:54 +0000 (-0400)
Subject: Merge pull request #2064 from mgeisler/simplejson-syntax-error-import
X-Git-Tag: v2.4.0~47
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e71282394c575e6c621fe17765405793db7ecf76;p=services%2Fpython-requests.git

Merge pull request #2064 from mgeisler/simplejson-syntax-error-import

compat: handle SyntaxError when importing simplejson
---

e71282394c575e6c621fe17765405793db7ecf76