Merge branch 'QA_3_4'
commit584fa4d2c8aa465a97db53cdb5d5df3ed61a69cc
authorMarc Delisle <marc@infomarc.info>
Tue, 15 Nov 2011 17:48:29 +0000 (15 12:48 -0500)
committerMarc Delisle <marc@infomarc.info>
Tue, 15 Nov 2011 17:48:29 +0000 (15 12:48 -0500)
treeedeba49e3edc9d816a0db14adeefa7fcee086ec2
parentfc2ee11a33acf90af83eff483d104067f5840939
parentac430ea21d6f49b781a9cda9940a5675d56f168e
Merge branch 'QA_3_4'
libraries/Error.class.php