]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorFerenc Kovacs <tyrael@php.net>
Tue, 6 May 2014 22:39:57 +0000 (00:39 +0200)
committerFerenc Kovacs <tyrael@php.net>
Tue, 6 May 2014 22:39:57 +0000 (00:39 +0200)
* PHP-5.6:
  Fixed tests (they might fail from time to time because of session GC)
  Fix author name on the #63228 patch.


Trivial merge