]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3b10478 5cf2f87)
Merge branch 'PHP-5.4'
authorNikita Popov <nikic@php.net>
Thu, 5 Jul 2012 19:00:16 +0000 (21:00 +0200)
committerNikita Popov <nikic@php.net>
Thu, 5 Jul 2012 19:00:16 +0000 (21:00 +0200)
* PHP-5.4:
  Fix potential integer overflow in nl2br
  Fix potential integer overflow in bin2hex


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.