merged branch raulfraile/patch-1 (PR #665)
authorFabien Potencier <fabien.potencier@gmail.com>
Tue, 13 Mar 2012 16:44:20 +0000 (17:44 +0100)
committerFabien Potencier <fabien.potencier@gmail.com>
Tue, 13 Mar 2012 16:44:20 +0000 (17:44 +0100)
Commits
-------

0519419 Updated 'convert_encoding' filter documentation

Discussion
----------

Updated 'convert_encoding' filter documentation

Updated 'convert_encoding' filter documentation to clarify which extension will be used in case both `iconv` and `mbstring` are installed.


Trivial merge