Merge branch 'QA_3_4'
commit480e77e77e6a8f437ee50fa4c0603b494fe6407b
authorMarc Delisle <marc@infomarc.info>
Sat, 24 Sep 2011 10:18:00 +0000 (24 06:18 -0400)
committerMarc Delisle <marc@infomarc.info>
Sat, 24 Sep 2011 10:18:00 +0000 (24 06:18 -0400)
tree16ea81baf4b2a64615d101b54e88e64dc9c80804
parentefa9eeb5583d95972af3fe195e903ac843103de8
parent158ce0657a8e9779348bbde43332b6a07ee37886
Merge branch 'QA_3_4'
libraries/header_scripts.inc.php