From: Remi Collet <remi@php.net>
Date: Sat, 25 Oct 2014 09:30:29 +0000 (+0200)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: php-5.6.3RC1~49
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=cefa310cf9adad596e7e0122dd07352fe36affa0;p=php

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  NEWS
  Fix bug #68283: fileinfo: out-of-bounds read in elf note headers
---

cefa310cf9adad596e7e0122dd07352fe36affa0