]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.5'
authorStanislav Malyshev <stas@php.net>
Mon, 25 Mar 2013 02:04:43 +0000 (19:04 -0700)
committerStanislav Malyshev <stas@php.net>
Mon, 25 Mar 2013 02:04:43 +0000 (19:04 -0700)
commitbe278293e432cdeefc2c9f855acf74333884d888
tree22399027aa5a99af332de7dfe97b7f6c60d8f46c
parent1e8423b041fc3a60b6c85388519ad6a5cfd855c4
parentbd0b09c6103490437a30592d2adf1d3935f8e90c
Merge branch 'PHP-5.5'

* PHP-5.5:
  fix bug #64490 - add __FreeBSD_kernel__ to allowed FreeBSD defs