From: Bob Weinand <bobwei9@hotmail.com>
Date: Tue, 24 Dec 2013 12:20:12 +0000 (+0100)
Subject: Merge branch 'PHP-5.6'
X-Git-Tag: PRE_PHPNG_MERGE~353^2~100
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c02acf3c29189c4153e0d1f5894ed630197b4a2c;p=php

Merge branch 'PHP-5.6'
---

c02acf3c29189c4153e0d1f5894ed630197b4a2c