From: Bob Weinand <bobwei9@hotmail.com>
Date: Sun, 15 Jun 2014 21:55:44 +0000 (+0200)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: PRE_PHPNG_MERGE~187^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0913c1509295a7db8cfc33e3b50cd1bc948b1864;p=php

Merge branch 'PHP-5.5' into PHP-5.6
---

0913c1509295a7db8cfc33e3b50cd1bc948b1864