]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.6'
authorJulien Pauli <jpauli@php.net>
Wed, 4 Feb 2015 16:34:28 +0000 (17:34 +0100)
committerJulien Pauli <jpauli@php.net>
Wed, 4 Feb 2015 16:34:28 +0000 (17:34 +0100)
commitf262e5f250908f9c2b6455227dc2577dfb56ce85
treebed6988d01a19130b56e2bdfaecfbbe5126c438c
parenta787719d4f8f27962ef463ec111dfc3fb3c7745b
parent421d309908f56c13050e132ff3fadd2682ce0220
Merge branch 'PHP-5.6'

* PHP-5.6:
  5.6.7 now
  5.5.23 now

Conflicts:
configure.in
main/php_version.h