]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.4' into PHP-5.5
authorAnatol Belski <ab@php.net>
Mon, 15 Jul 2013 15:35:29 +0000 (17:35 +0200)
committerAnatol Belski <ab@php.net>
Mon, 15 Jul 2013 15:35:29 +0000 (17:35 +0200)
commite7a4cf8d7ee68ade2901c1069f2af7ff14273333
tree24ad60417dcb87a37a8bc37755543b4673e4abef
parent904c5d7ba89ec411a7dcde6a848640cbb56a45f9
parent9561e598a0b0abfa6f41550830791a5350a1f837
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  fix buffer overrun
main/php_ini.c