From: Bob Weinand <bobwei9@hotmail.com>
Date: Sun, 15 Jun 2014 20:24:44 +0000 (+0200)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.15RC1~59
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f5f1c702cd37b759f43f030b639959712975e491;p=php

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

f5f1c702cd37b759f43f030b639959712975e491