From: Derick Rethans <github@derickrethans.nl>
Date: Wed, 27 Nov 2013 22:01:16 +0000 (+0000)
Subject: Merge branch 'PHP-5.6'
X-Git-Tag: PRE_PHPNG_MERGE~353^2~171^2~21^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e7a6d0b163e4edd073b57c053b1ea205a951fdbb;p=php

Merge branch 'PHP-5.6'
---

e7a6d0b163e4edd073b57c053b1ea205a951fdbb