]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.4' into PHP-5.5
authorFerenc Kovacs <tyrael@php.net>
Tue, 6 May 2014 22:38:32 +0000 (00:38 +0200)
committerFerenc Kovacs <tyrael@php.net>
Tue, 6 May 2014 22:38:32 +0000 (00:38 +0200)
commit579898e3382ae975ab1cc03738676e4e6582bf89
tree5a61b96fb4f0fd325c308ee2ce3fd8671e6399ff
parent58f4bf441a89bde7e91e3a8fdcd900cbc61df558
parentf880013c4d0a65baa104c19cd8058a970295eb80
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.