[PHP-CVS] com php-src: Merge branch 'PHP-5.4' into PHP-5.5: ext/mysqli/mysqli_nonapi.c main/output.c

[Xinchen Hui]

Commit:    093d11959782f5bb66c6e688da542a4243770ed7
Author:    Xinchen Hui <larue...@php.net>         Fri, 30 Nov 2012 14:30:37 
+0800
Parents:   9e1d3cfdabf8665aec4d121bafa31cddd6ca7231 
b6898195674a26bf6588c284a6a2616bbaaa908f
Branches:  PHP-5.5

Link:       
http://git.php.net/?p=php-src.git;a=commitdiff;h=093d11959782f5bb66c6e688da542a4243770ed7

Log:
Merge branch 'PHP-5.4' into PHP-5.5

Changed paths:
  MM  ext/mysqli/mysqli_nonapi.c
  MM  main/output.c


Diff:



--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php