From: Stanislav Malyshev <stas@php.net>
Date: Wed, 2 Mar 2016 08:03:09 +0000 (-0800)
Subject: Merge branch 'PHP-7.0'
X-Git-Tag: php-7.1.0alpha1~542
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f2656af7df56ce9c1af77891dc46f3c7f1a8947a;p=php

Merge branch 'PHP-7.0'

* PHP-7.0:
  fix wddx merge
---

f2656af7df56ce9c1af77891dc46f3c7f1a8947a