]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.4' into PHP-5.5
authorPierre Joye <pierre.php@gmail.com>
Tue, 9 Apr 2013 08:09:47 +0000 (10:09 +0200)
committerPierre Joye <pierre.php@gmail.com>
Tue, 9 Apr 2013 08:09:47 +0000 (10:09 +0200)
commit24f1045d55fa4d3df357b76cf6e35a1407267cf1
tree1adb7ce6a96f70dab2cb076d335012a18a8240db
parent1359eaa057b5633e9d78010b60bcb57a79130774
parentaab56593578069bda2d50727cba15e8e19214d12
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  fix possible NULL deref