From: Nikita Popov <nikic@php.net>
Date: Fri, 29 Nov 2013 22:32:14 +0000 (+0100)
Subject: Merge branch 'PHP-5.6'
X-Git-Tag: PRE_PHPNG_MERGE~353^2~171^2~13
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=065c8e77e25f30eb398d227a556aa95beb63e92d;p=php

Merge branch 'PHP-5.6'
---

065c8e77e25f30eb398d227a556aa95beb63e92d