From: Anatol Belski <ab@php.net>
Date: Thu, 10 Jul 2014 20:15:52 +0000 (+0200)
Subject: Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6
X-Git-Tag: PRE_PHPNG_MERGE~96^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fbc21af87b752b99f6b78503cadc89dbba6c98f1;p=php

Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6

Conflicts:
	sapi/litespeed/lsapilib.h
---

fbc21af87b752b99f6b78503cadc89dbba6c98f1