]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.6'
authorJulien Pauli <jpauli@php.net>
Tue, 7 Jul 2015 14:03:37 +0000 (16:03 +0200)
committerJulien Pauli <jpauli@php.net>
Tue, 7 Jul 2015 14:03:37 +0000 (16:03 +0200)
commitbcd6bc46f493fd294eb8f7bf6bcab630ffb0cd6b
tree7e9fc5a5fecd11f406b9bb66a0320b11cd784673
parentdf499b91086b5aab2deeb6884fc063eef307ed73
parent4c34d574147d2b23d3e4d8fb454b6102eb2ddfc1
Merge branch 'PHP-5.6'

* PHP-5.6:
  Fix test related to c22da81

Conflicts:
ext/standard/tests/general_functions/bug41037.phpt