[Phpmyadmin-git] [phpmyadmin/phpmyadmin] f384c8: Fix format string

Branch: refs/heads/QA_3_5 Home: https://github.com/phpmyadmin/phpmyadmin Commit: f384c820b7e243d29564e0b62147b31e8e4557e5 https://github.com/phpmyadmin/phpmyadmin/commit/f384c820b7e243d29564e0b6214… Author: Michal Čihař <mcihar(a)suse.cz> Date: 2012-04-09 (Mon, 09 Apr 2012) Changed paths: M po/de.po Log Message: ----------- Fix format string Commit: 591d1518fe190b48de98d4638b44634b64fd82d0 https://github.com/phpmyadmin/phpmyadmin/commit/591d1518fe190b48de98d4638b4… Author: Marc Delisle <marc(a)infomarc.info> Date: 2012-04-11 (Wed, 11 Apr 2012) Changed paths: M Documentation.html M README M libraries/Config.class.php Log Message: ----------- 3.4.11-rc1 Commit: 3345d64a6f9152e44837e8ec281824d2769ae274 https://github.com/phpmyadmin/phpmyadmin/commit/3345d64a6f9152e44837e8ec281… Author: Marc Delisle <marc(a)infomarc.info> Date: 2012-04-14 (Sat, 14 Apr 2012) Changed paths: M ChangeLog M Documentation.html M README M libraries/Config.class.php Log Message: ----------- 3.4.11 release Commit: 7738ec98e86dced5489d76456167e594c9a2684d https://github.com/phpmyadmin/phpmyadmin/commit/7738ec98e86dced5489d7645616… Author: Marc Delisle <marc(a)infomarc.info> Date: 2012-04-14 (Sat, 14 Apr 2012) Changed paths: M po/si.po Log Message: ----------- Merge branch 'QA_3_4' into MAINT_3_5_0 Commit: ea17cef3425b7a4576e61a955ddbfdc8d7627453 https://github.com/phpmyadmin/phpmyadmin/commit/ea17cef3425b7a4576e61a955dd… Author: Marc Delisle <marc(a)infomarc.info> Date: 2012-04-14 (Sat, 14 Apr 2012) Changed paths: M ChangeLog Log Message: ----------- Fix merge conflicts Commit: 8b31dd3991621c04d30d2623aa599cf4cd542a60 https://github.com/phpmyadmin/phpmyadmin/commit/8b31dd3991621c04d30d2623aa5… Author: Marc Delisle <marc(a)infomarc.info> Date: 2012-04-14 (Sat, 14 Apr 2012) Changed paths: M ChangeLog Log Message: ----------- Merge branch 'MAINT_3_5_0' into QA_3_5 Compare: https://github.com/phpmyadmin/phpmyadmin/compare/92f8d79...8b31dd3