]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 83542dc c56ff39)
Merge branch 'PHP-5.3' into PHP-5.4
authorDavid Soria Parra <dsp@php.net>
Thu, 7 Jun 2012 07:44:59 +0000 (09:44 +0200)
committerDavid Soria Parra <dsp@php.net>
Thu, 7 Jun 2012 07:44:59 +0000 (09:44 +0200)
By Till Klampaeckel
* PHP-5.3:
  Don't depend on a fixed path for PHP shebang but use /usr/bin/env (cherry picked from commit 89c5d981603ed4a2a54f86c20cec4f263c58ded6)


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.