From: Anatoliy Belsky <ab@php.net>
Date: Wed, 22 Aug 2012 09:45:32 +0000 (+0200)
Subject: Merge branch 'PHP-5.4'
X-Git-Tag: php-5.5.0alpha1~20^2~31
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=dac25a0d50f58aa76b3791656cca835fb43d533e;p=php

Merge branch 'PHP-5.4'

* PHP-5.4:
  Fixed bug #62313 Zend\tests\errmsg_021.phpt fails
---

dac25a0d50f58aa76b3791656cca835fb43d533e