]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 173cd18 b727934)
Merge branch 'PHP-5.5' into PHP-5.6
authorStanislav Malyshev <stas@php.net>
Mon, 14 Apr 2014 22:47:53 +0000 (15:47 -0700)
committerStanislav Malyshev <stas@php.net>
Mon, 14 Apr 2014 22:47:53 +0000 (15:47 -0700)
* PHP-5.5:
  Fix test - on CI somebody could create a process in the meantime


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