]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2d0215b a6734f7)
Merge branch 'PHP-5.5' into PHP-5.6
authorJulien Pauli <jpauli@php.net>
Thu, 7 Jan 2016 12:55:09 +0000 (13:55 +0100)
committerJulien Pauli <jpauli@php.net>
Thu, 7 Jan 2016 12:55:09 +0000 (13:55 +0100)
* PHP-5.5:
  5.5.32 now

Conflicts:
configure.in
main/php_version.h


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