]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.3' into PHP-5.4
authorULF WENDEL <uw@php.net>
Sat, 29 Sep 2012 10:17:13 +0000 (12:17 +0200)
committerULF WENDEL <uw@php.net>
Sat, 29 Sep 2012 10:17:13 +0000 (12:17 +0200)
commit13d4d8e2d037385bfa2c7775929b65ae1f73998d
tree934902490f62df7e1d09928f1934adc5f433c21a
parentc8cc0cde34879647a1d7f957e745ff4de74e7b98
parent20e76f4487baf60dc52b348e86bae4628026c4c2
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  Minor changes for MySQL 5.6
  NEWS for 76601c4

Conflicts:
NEWS