]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5'
authorPierre Joye <pierre.php@gmail.com>
Tue, 9 Apr 2013 08:09:54 +0000 (10:09 +0200)
committerPierre Joye <pierre.php@gmail.com>
Tue, 9 Apr 2013 08:09:54 +0000 (10:09 +0200)
* PHP-5.5:
  fix possible NULL deref


Trivial merge