From: Ferenc Kovacs <tyrael@php.net>
Date: Mon, 19 Oct 2015 21:07:58 +0000 (+0200)
Subject: Merge branch 'PHP-7.0'
X-Git-Tag: php-7.1.0alpha1~927
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1eb8e748346733db387a70ed7617f1fcd5e36ef1;p=php

Merge branch 'PHP-7.0'

* PHP-7.0:
  fixup, both catched by nikic
  use another character device in this test as /dev/console seems that it is different for lxc containers
  the de_DE(iso-8859-1) locale is not available on ubuntu by default, but there is no reason to require that over the utf-8 one
  let's try running our testsuite without sudo
---

1eb8e748346733db387a70ed7617f1fcd5e36ef1