]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.6'
authorFerenc Kovacs <tyrael@php.net>
Wed, 26 Nov 2014 09:24:18 +0000 (10:24 +0100)
committerFerenc Kovacs <tyrael@php.net>
Wed, 26 Nov 2014 09:24:18 +0000 (10:24 +0100)
commit078066fbd8f2d1d547cd3efb3305cfe71d23d54a
treef279303f23a4b6eb208c383af585ebce8b28a61e
parent6e56c13517740c215ba4c6de828608dd671319ed
parentfa2a2a105900e36f8882093c8c48e0ecfeb4b3ac
Merge branch 'PHP-5.6'

* PHP-5.6:
  PHP-5.6.5 is next

Conflicts:
configure.in
main/php_version.h