From: Ferenc Kovacs <tyrael@php.net>
Date: Wed, 1 Apr 2015 22:07:13 +0000 (+0200)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: php-5.6.9RC1~79^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9806a37a79f9e858c8ea54899942c9a681b98f29;p=php

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  sigh, can't even copypaste without screwing up
---

9806a37a79f9e858c8ea54899942c9a681b98f29