[Phpmyadmin-git] [phpmyadmin/phpmyadmin] a1c4d4: Merge remote-tracking branch 'origin/master'

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: a1c4d46dfd573ea1a7842cb68636613466c9f9a2 https://github.com/phpmyadmin/phpmyadmin/commit/a1c4d46dfd573ea1a7842cb6863… Author: Michal Čihař <weblate(a)l10n.cihar.com> Date: 2012-04-09 (Mon, 09 Apr 2012) Changed paths: M ChangeLog M Documentation.html M db_structure.php M libraries/config.default.php M libraries/config/messages.inc.php M libraries/config/setup.forms.php M libraries/config/user_preferences.forms.php M libraries/db_info.inc.php M libraries/db_structure.lib.php M libraries/display_tbl.lib.php M sql.php M tbl_alter.php M tbl_operations.php Log Message: ----------- Merge remote-tracking branch 'origin/master'