]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.4' into PHP-5.5
authorSara Golemon <sgolemon@fb.com>
Fri, 3 Oct 2014 01:55:14 +0000 (18:55 -0700)
committerSara Golemon <sgolemon@fb.com>
Fri, 3 Oct 2014 01:55:14 +0000 (18:55 -0700)
* PHP-5.4:
  Add hash to EXTENSIONS file

1  2 
EXTENSIONS

diff --cc EXTENSIONS
Simple merge