From: Felipe Pena <felipensp@gmail.com>
Date: Mon, 30 Apr 2012 18:56:15 +0000 (-0300)
Subject: Merge branch 'PHP-5.4'
X-Git-Tag: php-5.5.0alpha1~247
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=45ef3c759e80b4eda2e24b2f497be58268989b5f;p=php

Merge branch 'PHP-5.4'

* PHP-5.4:
  - Fixed Windows build
---

45ef3c759e80b4eda2e24b2f497be58268989b5f