From: Michael Wallner <mike@php.net>
Date: Thu, 12 Dec 2013 11:09:34 +0000 (+0100)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.8RC1~22^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8ee6fe9856cad30d01d6c8e3b5574dfc502bbfc6;p=php

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  fix test
---

8ee6fe9856cad30d01d6c8e3b5574dfc502bbfc6