From: Michael Wallner <mike@php.net>
Date: Mon, 30 Mar 2015 11:48:57 +0000 (+0200)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: php-5.6.8RC1~18
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3a660bf3a5a73c10e05eccfcdf26d978f585f0af;p=php

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fixed bug 64343

; Lesson learned: do not rebase on a merge commit
---

3a660bf3a5a73c10e05eccfcdf26d978f585f0af