From: Yasuo Ohgaki Date: Mon, 27 Jan 2014 09:57:45 +0000 (+0900) Subject: Merge branch 'PHP-5.5' into PHP-5.6 X-Git-Tag: PRE_PHPNG_MERGE~388^2~2^2 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a63c0950330997361a082bd35c9e62a70417ec66;p=php Merge branch 'PHP-5.5' into PHP-5.6 * PHP-5.5: Remove obsolete description Conflicts: php.ini-development php.ini-production --- a63c0950330997361a082bd35c9e62a70417ec66