From: Stanislav Malyshev <stas@php.net>
Date: Wed, 24 Apr 2013 17:17:11 +0000 (-0700)
Subject: Merge branch 'PHP-5.5'
X-Git-Tag: php-5.6.0alpha1~448^2~23^2~8
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=aa2b3a4b31e827337480248c265445ad97b2be43;p=php

Merge branch 'PHP-5.5'

* PHP-5.5:
  5.4.16-dev
---

aa2b3a4b31e827337480248c265445ad97b2be43