From: Michael Wallner <mike@php.net>
Date: Thu, 12 Dec 2013 11:09:54 +0000 (+0100)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: php-5.6.0alpha1~120^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1dfbe99ce45d3b480dcaddcd2a4c3f4fe06ea0b3;p=php

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  fix test
---

1dfbe99ce45d3b480dcaddcd2a4c3f4fe06ea0b3