]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5'
authorPierre Joye <pierre.php@gmail.com>
Wed, 27 Feb 2013 15:03:27 +0000 (16:03 +0100)
committerPierre Joye <pierre.php@gmail.com>
Wed, 27 Feb 2013 15:03:27 +0000 (16:03 +0100)
* PHP-5.5:
  - add only once
  - add new file for m4 as well

1  2 
ext/gd/config.w32

Simple merge