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

Merge branch 'PHP-5.4' into PHP-5.5

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

efbf573e9fcbbd0236177b7538d720f94c1f730a