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

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

7cef3a57ad7fd64e5789648ed476666f1cbc598c