From: Anatoliy Belsky <ab@php.net>
Date: Mon, 3 Dec 2012 09:44:10 +0000 (+0100)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.0alpha2~59
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=262decd35f60f622706ebadfbc0fb49e0f2928f6;p=php

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fix test with a slightly different warning in TS
---

262decd35f60f622706ebadfbc0fb49e0f2928f6