From: Stanislav Malyshev <stas@php.net>
Date: Mon, 14 Apr 2014 00:04:00 +0000 (-0700)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: PRE_PHPNG_MERGE~391^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=04a11b850a17103d5a508932c768d423fbf6d870;p=php

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fix windows build
---

04a11b850a17103d5a508932c768d423fbf6d870