From: Fabien Potencier <fabien.potencier@gmail.com>
Date: Mon, 8 Apr 2013 12:10:12 +0000 (+0200)
Subject: merged branch ThatGuyBen/patch-1 (PR #1048)
X-Git-Url: http://git.silmor.de/gitweb/?a=commitdiff_plain;h=0f74ca8a4c99b604c1ae9583d7560a7cb91e6481;p=web%2Fkonrad%2Ftwig.git

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
---

0f74ca8a4c99b604c1ae9583d7560a7cb91e6481