Merge pull request #1022 from kisielk/master
authorKenneth Reitz <me@kennethreitz.com>
Mon, 17 Dec 2012 19:03:40 +0000 (11:03 -0800)
committerKenneth Reitz <me@kennethreitz.com>
Mon, 17 Dec 2012 19:03:40 +0000 (11:03 -0800)
JSON-related doc fixes


Trivial merge