]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.4' into PHP-5.5
authorAnatol Belski <ab@php.net>
Mon, 22 Jul 2013 12:51:11 +0000 (14:51 +0200)
committerAnatol Belski <ab@php.net>
Mon, 22 Jul 2013 12:51:11 +0000 (14:51 +0200)
* PHP-5.4:
  fixed possible null deref


Trivial merge