From: Michael Wallner <mike@php.net>
Date: Wed, 30 Jul 2014 18:13:39 +0000 (+0200)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: php-5.6.0RC4~1^2~28
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ceadf783fe28d3dbc786bf4acb81735dc797d4d0;p=php

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  BFN
  Fixed bug #67715 (php-milter does not build and crashes randomly).
---

ceadf783fe28d3dbc786bf4acb81735dc797d4d0