From: Remi Collet <remi@php.net>
Date: Mon, 23 Jun 2014 08:18:55 +0000 (+0200)
Subject: Merge branch 'PHP-5.6'
X-Git-Tag: PRE_PHPNG_MERGE~168
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a52b927bf3d760c1979fc7d3f93fef63c28ec3b1;p=php

Merge branch 'PHP-5.6'

* PHP-5.6:
  Better fix for phpdbg + libedit - fix include - disable coloured prompt only with libedit
  Fix https://github.com/krakjoe/phpdbg/issues/91
---

a52b927bf3d760c1979fc7d3f93fef63c28ec3b1