merged branch ThatGuyBen/patch-1 (PR #1048)
authorFabien Potencier <fabien.potencier@gmail.com>
Mon, 8 Apr 2013 12:10:12 +0000 (14:10 +0200)
committerFabien Potencier <fabien.potencier@gmail.com>
Mon, 8 Apr 2013 12:10:12 +0000 (14:10 +0200)
commit0f74ca8a4c99b604c1ae9583d7560a7cb91e6481
tree2c35835de756dfbbc827aed7428e26047a6d62b5
parent399916916533589c95dc04e1afd4aeefa34928ad
parent742043f9e269696b85e89b693c1f526066f468a9
merged branch ThatGuyBen/patch-1 (PR #1048)

This PR was merged into the master branch.

Discussion
----------

Update json_encode.rst

a more-useful description of the "options" argument >_>

Commits
-------

742043f Update json_encode.rst