From: Remi Collet <remi@php.net>
Date: Tue, 10 Jun 2014 12:05:02 +0000 (+0200)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: php-5.6.0RC1~1^2~43
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5e7cb43890cebbd82bf8c951b1db0e9417931f5a;p=php

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  NEWS
  NEWS
  Fixed Bug #67410 fileinfo: mconvert incorrect handling of truncated pascal string size
---

5e7cb43890cebbd82bf8c951b1db0e9417931f5a