From: Rasmus Lerdorf <rasmus@php.net>
Date: Sat, 3 Aug 2013 16:15:28 +0000 (-0400)
Subject: Merge commit '626d96a'
X-Git-Tag: php-5.6.0alpha1~348
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b48f7e0c797d80a231f1b1436e349e44deba743d;p=php

Merge commit '626d96a'

* commit '626d96a':
  This doesn't fail in 5.5 anymore
---

b48f7e0c797d80a231f1b1436e349e44deba743d