From: Anatol Belski <ab@php.net>
Date: Sun, 16 Jun 2013 22:10:32 +0000 (+0200)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.0~25
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3625b83aaa242c7c6aff045c03203a1b195bc310;p=php

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  fix test
---

3625b83aaa242c7c6aff045c03203a1b195bc310