Merge branch 'QA_3_3'
commitd4f6b5c4ba7932c7ada66080d2a5351cc046447c
authorMarc Delisle <marc@infomarc.info>
Wed, 7 Jul 2010 10:13:38 +0000 (7 06:13 -0400)
committerMarc Delisle <marc@infomarc.info>
Wed, 7 Jul 2010 10:13:38 +0000 (7 06:13 -0400)
tree5a63b7460ad6140780dea5f695b70e3e15b40360
parentbd09ef50ff5b498e9cfc1be0b8987ae0fb3ce58d
parent8a153086a17cbc97423290b4fe7cfdf6f75e64a1
Merge branch 'QA_3_3'
libraries/config.default.php