Merge branch 'PHP-5.5' into PHP-5.6
authorRemi Collet <remi@php.net>
Mon, 20 Jan 2014 08:39:29 +0000 (09:39 +0100)
committerRemi Collet <remi@php.net>
Mon, 20 Jan 2014 08:39:29 +0000 (09:39 +0100)
* PHP-5.5:
  Skip readline tests which fail with libedit Add specific libedit test (output slightly differs)


Trivial merge