From: Bob Weinand <bobwei9@hotmail.com>
Date: Sun, 13 Apr 2014 17:25:07 +0000 (+0200)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.12RC1~19
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=eca0644e0acb391540e40a320e10782225654baf;p=php

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

eca0644e0acb391540e40a320e10782225654baf