]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.6'
authorRemi Collet <remi@php.net>
Fri, 7 Mar 2014 13:10:31 +0000 (14:10 +0100)
committerRemi Collet <remi@php.net>
Fri, 7 Mar 2014 13:10:31 +0000 (14:10 +0100)
commit397b8aa2adf27422c6049d92990b434eb7c45790
tree188395cfce5d74d449a705f2467d6bac2fc72644
parentddd855cbc2d126e5ef8ecba0103b97e23d53128f
parent7946c5a235b954d3d09adc94a62e96ce5dddd8d1
Merge branch 'PHP-5.6'

* PHP-5.6:
  add OPSYS_Z_CPM missing constant