Merge branch 'QA_3_4'
commit6a786a859e28d5aac0656d9813cf61d004dab56e
authorMarc Delisle <marc@infomarc.info>
Mon, 5 Dec 2011 19:14:26 +0000 (5 14:14 -0500)
committerMarc Delisle <marc@infomarc.info>
Mon, 5 Dec 2011 19:14:26 +0000 (5 14:14 -0500)
treee5a52211c3263e02d1ee78f8c6ac077d89a30942
parent63ffeebcf8ff87a380af397a8cb2cbc2b985622a
parentb02f4eec076ded51f258bb00c697ac72c13a9606
Merge branch 'QA_3_4'
ChangeLog
libraries/common.lib.php
libraries/db_info.inc.php