From: Nikita Popov <nikic@php.net>
Date: Thu, 5 Jul 2012 19:00:16 +0000 (+0200)
Subject: Merge branch 'PHP-5.4'
X-Git-Tag: php-5.5.0alpha1~91^2~10
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ed54357fcded8849c6830fa80b42bdde4650fdb8;p=php

Merge branch 'PHP-5.4'

* PHP-5.4:
  Fix potential integer overflow in nl2br
  Fix potential integer overflow in bin2hex
---

ed54357fcded8849c6830fa80b42bdde4650fdb8