From: Bob Weinand <bobwei9@hotmail.com>
Date: Sun, 12 Jan 2014 01:00:37 +0000 (+0100)
Subject: Merge branch 'PHP-5.6'
X-Git-Tag: PRE_PHPNG_MERGE~388^2~65^2~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a86e869ee8aeaf228cf483f48bdae65318b17499;p=php

Merge branch 'PHP-5.6'
---

a86e869ee8aeaf228cf483f48bdae65318b17499