From: Stanislav Malyshev <stas@php.net>
Date: Wed, 18 Mar 2015 05:39:21 +0000 (-0700)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: php-5.6.8RC1~63
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=58efcc7dd816c355a4254ae2768c080e0cd9127f;p=php

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  5.4.40 next
---

58efcc7dd816c355a4254ae2768c080e0cd9127f