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
Update icons for find and replace feature
Merge branch 'master' of github.com:phpmyadmin/phpmyadmin into findNreplace

Conflicts:
	ChangeLog
Remove tabs and trailing white spaces
Merge pull request #477 from Gemorroj/master

replace dirname(__FILE__) to __DIR__
Translated using Weblate (Hungarian)

Currently translated at 89.3% (2387 of 2673)
Fix typos
Translated using Weblate (Traditional Chinese)

Currently translated at 100.0% (2673 of 2673)
Merge remote-tracking branch 'origin/master'
Unit test for server_bin_log
Merge branch 'findNreplace' of git://github.com/kasunchathuranga/phpmyadmin into kasunchathuranga-findNreplace
Generate image sprites including new find and replace icon
Merge pull request #479 from xmujay/0629_UT_serverview2

unit test case for server_binlog newly refactored functions
Translated using Weblate (Hungarian)

Currently translated at 90.8% (2426 of 2673)
Merge remote-tracking branch 'origin/master'
Typo in file name
Merge remote-tracking branch 'origin/master'