]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2e79820 8b0f105)
Merge branch 'PHP-5.5' into PHP-5.6
authorAdam Harvey <aharvey@php.net>
Thu, 8 Jan 2015 19:16:32 +0000 (19:16 +0000)
committerAdam Harvey <aharvey@php.net>
Thu, 8 Jan 2015 19:16:32 +0000 (19:16 +0000)
* PHP-5.5:
  Calling crypt() with a salt of *0 should always return *1.
  5.5.22 now

Conflicts:
configure.in
main/php_version.h


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