Implement 'find and replace in a column' feature
Add ChangeLog entry for rfe #1405
Merge branch 'master' of github.com:phpmyadmin/phpmyadmin into findNreplace

Conflicts:
	ChangeLog
Adhere to English style guide
1. add UT for import ODS 2. fix warning in source code when import ODS file
fix the assert failure
Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin into UT_pluginss
Added methods PMA_cleanupRelations, PMA_countQueryResults, PMA_executeTheQuery
Translated using Weblate (Persian)

Currently translated at 36.9% (963 of 2607)
Merge remote-tracking branch 'origin/QA_4_0' into QA_4_0
add UT for PMA_ip_allow_deny.lib.php
Raise requirements to PHP 5.3
Remove compatibility code for PHP 5.2
Revert "Temporary workaround for bug #3783 :"

This reverts commit 2683f32033ab71b2b482479518cab2f70264718b.
Merge pull request #469 from adamgsoc2013/UT_plu_ip

add UT for PMA_ip_allow_deny.lib.php
using OpenOffice ODS file for importing ods testing
Missing include
Add missing include
Globals backups should not be required anymore
Globals backups should not be required anymore