Implementation of feature request 1410. AES_ENCRYPT w/ Salt
Implementation of feature request 1410. Firefox fix in javascript file
Modified PMA_Types_MySQL_test test cases
Fix bug #3907 undefined variables, function parameter problems
Thanks Rasmus Lerdorf for analyzing!
Add changelog entry for bug #3907
Update PHP-gettext to 1.0.11
Update Change log for #rfe1410
Merge branch 'QA_4_0' into bug-3907

Conflicts:
	ChangeLog
make function outside class starting with "PMA"; render HTML at once
refactor function naming on server view files
make function starting with "PMA"
add test getFontsizeOptions for "em","Pt","px" unit
Merge pull request #379 from mynetx/bug-3907

Fix most analysis results discovered in bug 3907
Fix merge conflicts
Use live here, fix bug#3936
Remove dead code
Merge commit '50ca355'
Fix merge conflicts
Merge pull request #387 from xmujay/2332_xmujay

make function outside class starting with "PMA"; render HTML at once
Merge pull request #390 from adamgsoc2013/unit_PMA2

add test getFontsizeOptions for "em","Pt","px" unit