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

Merge branch 'PHP-5.6'
---

ad358593a81cf5e16bb5dda5fa6e1282c85411b9