]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorFerenc Kovacs <tyrael@php.net>
Mon, 30 Jun 2014 10:31:25 +0000 (12:31 +0200)
committerFerenc Kovacs <tyrael@php.net>
Mon, 30 Jun 2014 10:31:25 +0000 (12:31 +0200)
* PHP-5.6:
  --enable-fpm for the travis build


Trivial merge