]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.4' into PHP-5.5
authorRemi Collet <remi@php.net>
Mon, 26 Nov 2012 12:05:37 +0000 (13:05 +0100)
committerRemi Collet <remi@php.net>
Mon, 26 Nov 2012 12:05:37 +0000 (13:05 +0100)
commit495ff0964d6c24f04f1d705334bb3a5ce49ea8cb
treea4c82af687db769c3a0af86a6d1bec34589b1cad
parentdfa5ca2b8dbaf0e4400dce8bcb156821aec384ce
parent7751a6882485de64365661f4e7918535c3992982
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Related bug #63588 fix length computation + optimize for speed
ext/json/json.c