]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.4' into PHP-5.5
authorAnatol Belski <ab@php.net>
Tue, 16 Jul 2013 16:05:45 +0000 (18:05 +0200)
committerAnatol Belski <ab@php.net>
Tue, 16 Jul 2013 16:05:45 +0000 (18:05 +0200)
commitfd5cdf89a8ddde4c5a9cf4cfb95415de07caf7b9
tree7c4568007bbfd258f76f3bd4bb7478a05f564124
parentf37ac6f5912d605633e0abf6310255b9d851d078
parentbb6d74918ea66099cf36c5509e844df0f15a7515
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  fix TS build
ext/mysqli/mysqli.c