From: Stanislav Malyshev <stas@php.net>
Date: Wed, 19 Jun 2013 05:59:34 +0000 (-0700)
Subject: Merge branch 'PHP-5.5'
X-Git-Tag: php-5.6.0alpha1~422
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a984dd4eb4281da48014478131f7f772bd104ca4;p=php

Merge branch 'PHP-5.5'

* PHP-5.5:
  5.4.18 next
---

a984dd4eb4281da48014478131f7f772bd104ca4