]> granicus.if.org Git - php/commit
projects / php / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: d7fb43e 95a0b11)
Merge branch 'pr-1483' into PHP-5.5
authorFerenc Kovacs <tyrael@php.net>
Mon, 19 Oct 2015 20:44:19 +0000 (22:44 +0200)
committerFerenc Kovacs <tyrael@php.net>
Mon, 19 Oct 2015 20:44:19 +0000 (22:44 +0200)
commitf3838a9c3561022cfeeb649093e4fdec715d39b0
tree0554ddf4b8f2c3a9b52b1dea031e869ceb008870tree | snapshot
parentd7fb43e30d662c7fff999521ebf15ddbb192c7cacommit | diff
parent95a0b11d0aec133168e0a2e03b79caf2fe1aab03commit | diff
Merge branch 'pr-1483' into PHP-5.5

* pr-1483:
  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
Unnamed repository; edit this file 'description' to name the repository.