]> granicus.if.org Git - php/commit
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)
commitbd20c7942334b48d5b8a854691e2db18fee921ab
tree427dbb0d01c89bbe5247e812831348d8dc4cda3d
parentb8d4a6939e7b91fe75218ab17aac9d9471ca2a6c
parent25f924abf62e70f3474b5885c12a521c68c2066d
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  fixed possible null deref