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

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fix broken test
---

6713f9c4b24b5be0d543f0f87cab0f401b0c41ed