]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorFerenc Kovacs <tyrael@php.net>
Sat, 29 Nov 2014 00:49:40 +0000 (01:49 +0100)
committerFerenc Kovacs <tyrael@php.net>
Sat, 29 Nov 2014 00:49:40 +0000 (01:49 +0100)
* PHP-5.6:
  fix test with readline on mac


Trivial merge