From: Anatol Belski <ab@php.net>
Date: Thu, 10 Jul 2014 20:35:41 +0000 (+0200)
Subject: Merge branch 'PHP-5.6'
X-Git-Tag: PRE_PHPNG_MERGE~95
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=efea4cc3e0f2b59dd68044f76a33e7a096453afa;p=php

Merge branch 'PHP-5.6'

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

efea4cc3e0f2b59dd68044f76a33e7a096453afa