From: Ferenc Kovacs <tyrael@php.net>
Date: Wed, 24 Jun 2015 22:23:21 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/PHP-5.6'
X-Git-Tag: php-7.0.0beta1~12^2~49^2~5
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=190478e9da8e199b6d8812c86554ed8f1b3d7900;p=php

Merge remote-tracking branch 'origin/PHP-5.6'

* origin/PHP-5.6:
  5.6.12 next
---

190478e9da8e199b6d8812c86554ed8f1b3d7900