Merge branch 'QA_3_3'
commit27a56224ff4a059593fb3c50a8385a7ee4027179
authorDieter Adriaenssens <ruleant@users.sourceforge.net>
Wed, 17 Mar 2010 21:14:47 +0000 (17 22:14 +0100)
committerDieter Adriaenssens <ruleant@users.sourceforge.net>
Wed, 17 Mar 2010 21:14:47 +0000 (17 22:14 +0100)
treee603261627b8b8772ed83948b974f7c8deb8d2be
parent8b221f354b54b0c282b96128acc6da5862b02668
parent142b1e2183660d25cb4827c56f8760f4cb66e714
Merge branch 'QA_3_3'

Conflicts:
ChangeLog
tbl_change.php
ChangeLog
main.php
tbl_change.php