From: Ferenc Kovacs <tyrael@php.net>
Date: Tue, 6 May 2014 22:38:32 +0000 (+0200)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.13RC1~22
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=579898e3382ae975ab1cc03738676e4e6582bf89;p=php

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fixed tests (they might fail from time to time because of session GC)
  Fix author name on the #63228 patch.
---

579898e3382ae975ab1cc03738676e4e6582bf89