From: Anatoliy Belsky <ab@php.net>
Date: Tue, 27 Nov 2012 15:14:00 +0000 (+0100)
Subject: Merge branch 'PHP-5.5'
X-Git-Tag: php-5.6.0alpha1~687^2~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1e8b6536abc655e06fdf8c9e62d364e4ece7848b;p=php

Merge branch 'PHP-5.5'

* PHP-5.5:
  This test isn't supposed to pass on windows
---

1e8b6536abc655e06fdf8c9e62d364e4ece7848b