]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorAnatol Belski <ab@php.net>
Wed, 27 Aug 2014 10:11:59 +0000 (12:11 +0200)
committerAnatol Belski <ab@php.net>
Wed, 27 Aug 2014 10:11:59 +0000 (12:11 +0200)
* PHP-5.6:
  fixed DBG_INF macro name
  reworked NEWS for 5.6.0GA

1  2 
ext/mysqlnd/mysqlnd_net.c

Simple merge