]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.5' into PHP-5.6
authorJulien Pauli <jpauli@php.net>
Fri, 21 Nov 2014 14:50:27 +0000 (15:50 +0100)
committerJulien Pauli <jpauli@php.net>
Fri, 21 Nov 2014 14:50:27 +0000 (15:50 +0100)
commitab3525c40124cd569fbde32a0bb123348b1048bc
treeeef9de8007c34155141769cecc7b6cf7865513db
parent64b9277867cb0da1a68a122b0a9fe6dfb78d9c84
parentcd3b46f28af49e5eaaa687d5d186e641ce147853
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fix #68185 - Inconsistent insteadof definition

Conflicts:
Zend/zend_compile.c
Zend/zend_compile.c