From: Anatol Belski <ab@php.net>
Date: Thu, 10 Jul 2014 20:34:55 +0000 (+0200)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.16RC1~53^2~2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=efcc789ef860742ca59db3723b3fad0e519d6461;p=php

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  fix end of stream exception when generating makefile
---

efcc789ef860742ca59db3723b3fad0e519d6461