]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 58f4bf4 f880013)
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)
* PHP-5.4:
  Fixed tests (they might fail from time to time because of session GC)
  Fix author name on the #63228 patch.


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.