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

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  - BFN
  - Fixed bug #64467 (Segmentation fault after imap_reopen failure) patch by: askalski at gmail dot com
  - Reclassify bug
---

402b3aaf56cbf3ce191f9d8985b056dc41c94dba