]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.5' into PHP-5.6
authorAdam Harvey <aharvey@php.net>
Thu, 1 May 2014 18:23:14 +0000 (11:23 -0700)
committerAdam Harvey <aharvey@php.net>
Thu, 1 May 2014 18:23:14 +0000 (11:23 -0700)
commitd5712d6ba4f1797993c49996c04be1a8b37e8dec
treef043ab853ab10321cb9c3a9d749300b183e2e537
parentf99449c3099f5fef826a41b768a18892ca896cd9
parenteb460966081305ac0d5b7792b277581ae4897f67
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Use the right path for the suggested PHP invocation in ext_skel.
ext/ext_skel