]> granicus.if.org Git - php/commit
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)
commitbd2229e709377de9d0a72b12563065b64d07042f
treed7fd0d9cc7650b8fa17448981cfc7e188d123db4
parent2d0215b063c4e26bc4d3eef67381e5f1bb8789c3
parenta6734f70e124fcccb1b488f40cc00a1fa07b5d4a
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  5.5.32 now

Conflicts:
configure.in
main/php_version.h