From: Rasmus Lerdorf <rasmus@lerdorf.com>
Date: Sat, 9 Nov 2013 17:46:43 +0000 (-0800)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.6~3
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=df7321359e0c11a1de99285dee64c8e69ee28653;p=php

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fix broken test
---

df7321359e0c11a1de99285dee64c8e69ee28653