From: Bob Weinand <bobwei9@hotmail.com>
Date: Sat, 21 Dec 2013 23:57:31 +0000 (+0100)
Subject: Merge branch 'PHP-5.6'
X-Git-Tag: PRE_PHPNG_MERGE~353^2~117
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5b1f6caaf0574cd72396b1b4c671bae82557c4b4;p=php

Merge branch 'PHP-5.6'
---

5b1f6caaf0574cd72396b1b4c671bae82557c4b4