From: Stanislav Malyshev <stas@php.net>
Date: Mon, 25 Mar 2013 02:04:43 +0000 (-0700)
Subject: Merge branch 'PHP-5.5'
X-Git-Tag: php-5.6.0alpha1~448^2~92^2~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=be278293e432cdeefc2c9f855acf74333884d888;p=php

Merge branch 'PHP-5.5'

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

be278293e432cdeefc2c9f855acf74333884d888