From: Yasuo Ohgaki Date: Mon, 17 Mar 2014 22:29:22 +0000 (+0900) Subject: Merge branch 'PHP-5.6' X-Git-Tag: PRE_PHPNG_MERGE~472 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=789b10ccb5d0dd25d1801ce1a18528d9937e1326;p=php Merge branch 'PHP-5.6' * PHP-5.6: Modified php.ini-* description for encoding related changes --- 789b10ccb5d0dd25d1801ce1a18528d9937e1326