]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.6'
authorJulien Pauli <jpauli@php.net>
Wed, 22 Jul 2015 07:28:59 +0000 (09:28 +0200)
committerJulien Pauli <jpauli@php.net>
Wed, 22 Jul 2015 07:28:59 +0000 (09:28 +0200)
commitc274e2397d27e5fb7d212b7b68b85a2bf82ceb3a
treef130e15dec238ce4db1aee23e1d3719a00a9c2df
parent348fc4d6fd00dc2826be3342a6e7e9d47bbc436a
parent3eee49557068fb4d07230668a23d2c50738cc3f4
Merge branch 'PHP-5.6'

* PHP-5.6:
  5.6.13 now

Conflicts:
configure.in
main/php_version.h