]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.5' into PHP-5.6
authorFerenc Kovacs <tyrael@php.net>
Tue, 6 May 2014 22:38:57 +0000 (00:38 +0200)
committerFerenc Kovacs <tyrael@php.net>
Tue, 6 May 2014 22:38:57 +0000 (00:38 +0200)
commitd2f283884f068d8f5b0269782876a28c0a41c9bb
treef879f2016babc613029bebef3b7c7fa40c7d089c
parent78cb0c1dbc00e5c10830a622c458958e4559d7d1
parent579898e3382ae975ab1cc03738676e4e6582bf89
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.