From: Ferenc Kovacs <tyrael@php.net>
Date: Tue, 6 May 2014 22:38:57 +0000 (+0200)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: PRE_PHPNG_MERGE~302^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d2f283884f068d8f5b0269782876a28c0a41c9bb;p=php

Merge branch 'PHP-5.5' into PHP-5.6

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

d2f283884f068d8f5b0269782876a28c0a41c9bb