From: Felipe Pena <felipensp@gmail.com>
Date: Wed, 26 Jun 2013 16:36:50 +0000 (-0300)
Subject: Merge branch 'PHP-5.5'
X-Git-Tag: php-5.6.0alpha1~384^2~17^2~9
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c743d0c9dc1910596a385ceee0c2cc033b3926f9;p=php

Merge branch 'PHP-5.5'

* PHP-5.5:
  - Fixed test
---

c743d0c9dc1910596a385ceee0c2cc033b3926f9