]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorChristoph M. Becker <cmb@php.net>
Sat, 15 Aug 2015 00:27:09 +0000 (02:27 +0200)
committerChristoph M. Becker <cmb@php.net>
Sat, 15 Aug 2015 00:27:09 +0000 (02:27 +0200)
* PHP-5.6:
  fixed wrong params in proto

1  2 
ext/standard/user_filters.c

Simple merge