]> granicus.if.org Git - php/commit
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)
commit62b45983f7441d40dfbf9f115d212575f684d3a2
tree00f77b323d4ae99ba40a17b12265e3d19959ef7f
parentd9dbca854618b6327018da57b684d6fac939aea8
parent3ec93ee19f174f27285872515d236028f0e079f9
Merge branch 'PHP-5.6'

* PHP-5.6:
  --enable-fpm for the travis build