From: Felipe Pena <felipensp@gmail.com>
Date: Wed, 26 Jun 2013 18:08:57 +0000 (-0300)
Subject: Merge branch 'PHP-5.5'
X-Git-Tag: php-5.6.0alpha1~384^2~17^2~7
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4113b5aee3048e49919c2dfa9e3d0c9ff622e83d;p=php

Merge branch 'PHP-5.5'

* PHP-5.5:
  - BFN
  - Fixed bug #63983 (enabling FPM borks compile on FreeBSD) patch by: chibisuke at web dot de
---

4113b5aee3048e49919c2dfa9e3d0c9ff622e83d