From: Bob Weinand <bobwei9@hotmail.com>
Date: Sat, 12 Apr 2014 21:54:29 +0000 (+0200)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.12RC1~21
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9302be375436c1b77654443406389c5976a0c20b;p=php

Merge branch 'PHP-5.4' into PHP-5.5
---

9302be375436c1b77654443406389c5976a0c20b