]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5'
authorStanislav Malyshev <stas@php.net>
Mon, 25 Mar 2013 02:07:43 +0000 (19:07 -0700)
committerStanislav Malyshev <stas@php.net>
Mon, 25 Mar 2013 02:07:43 +0000 (19:07 -0700)
* PHP-5.5:
  fix bug #64490 - add __FreeBSD_kernel__ to allowed FreeBSD defs


Trivial merge