]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.4'
authorNikita Popov <nikic@php.net>
Sun, 8 Apr 2012 20:41:04 +0000 (22:41 +0200)
committerNikita Popov <nikic@php.net>
Sun, 8 Apr 2012 20:41:04 +0000 (22:41 +0200)
* PHP-5.4:
  Fix bug #61660: bin2hex(hex2bin($data)) != $data


Trivial merge