]> granicus.if.org Git - php/commitdiff
Merge branch 'master' of git.php.net:php-src
authorULF WENDEL <uw@php.net>
Sat, 29 Sep 2012 10:29:59 +0000 (12:29 +0200)
committerULF WENDEL <uw@php.net>
Sat, 29 Sep 2012 10:29:59 +0000 (12:29 +0200)
* 'master' of git.php.net:php-src:
  - BFN
  Minor changes for MySQL 5.6
  NEWS for 76601c4


Trivial merge