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

Merge branch 'PHP-5.5' into PHP-5.6

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

63abaa6d69236c4abf06a00fbc64908e29b7ab81