]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorAnatol Belski <ab@php.net>
Mon, 21 Jul 2014 12:48:06 +0000 (14:48 +0200)
committerAnatol Belski <ab@php.net>
Mon, 21 Jul 2014 12:48:06 +0000 (14:48 +0200)
* PHP-5.6:
  fix nmake snap when ext name is different in target dll


Trivial merge