]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.3' into PHP-5.4
authorPierre Joye <pierre.php@gmail.com>
Tue, 9 Apr 2013 08:09:36 +0000 (10:09 +0200)
committerPierre Joye <pierre.php@gmail.com>
Tue, 9 Apr 2013 08:09:36 +0000 (10:09 +0200)
commitaab56593578069bda2d50727cba15e8e19214d12
tree4ec7b6433df89eb0638d7df74f3e3e8bb5c095fc
parent10d62de4aadd83638967ff86dcb2f94688f8dece
parent88b3cdc4e9ec199044dd9b2d82d12639226091dd
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  fix possible NULL deref