]> granicus.if.org Git - php/commitdiff
Merge branch 'pull-request/381'
authorStanislav Malyshev <stas@php.net>
Sun, 18 Aug 2013 21:20:46 +0000 (14:20 -0700)
committerStanislav Malyshev <stas@php.net>
Sun, 18 Aug 2013 21:20:46 +0000 (14:20 -0700)
* pull-request/381:
  Fixed #65225: PHP_BINARY incorrectly set

1  2 
main/main.c

diff --cc main/main.c
Simple merge