Merge branch 'QA_3_3'
commit89552c74c4fe7585e595d30c6b3553c21b89ae61
authorMarc Delisle <marc@infomarc.info>
Wed, 12 Jan 2011 13:05:40 +0000 (12 08:05 -0500)
committerMarc Delisle <marc@infomarc.info>
Wed, 12 Jan 2011 13:05:40 +0000 (12 08:05 -0500)
tree545da52d5a9b533ff2c3a0e272216d34ffe84daf
parent7411f7cca83af4e763fb6bf1eb08e67800bda770
parent31cd4bdd6a7c42527b2011201d378e3c9accce8a
Merge branch 'QA_3_3'
ChangeLog
libraries/dbi/mysql.dbi.lib.php
libraries/dbi/mysqli.dbi.lib.php