From: Michael Wallner <mike@php.net>
Date: Fri, 6 Dec 2013 09:39:10 +0000 (+0100)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: php-5.6.0alpha1~140
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1135f3a042eac48d03b56ecb7b98ac54a8d92674;p=php

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  BFN
---

1135f3a042eac48d03b56ecb7b98ac54a8d92674