From: Stanislav Malyshev <stas@php.net>
Date: Mon, 14 Apr 2014 00:03:28 +0000 (-0700)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.12RC1~13
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=df8e34bcc133bec10daa01dee3c2eb0fe59bb4bb;p=php

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fix windows build
---

df8e34bcc133bec10daa01dee3c2eb0fe59bb4bb