Merge pull request #710 from zachwill/develop
authorKenneth Reitz <me@kennethreitz.com>
Sun, 8 Jul 2012 04:21:54 +0000 (21:21 -0700)
committerKenneth Reitz <me@kennethreitz.com>
Sun, 8 Jul 2012 04:21:54 +0000 (21:21 -0700)
Add try/catch for simplejson vs json


Trivial merge