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

[Michal Čihař]

  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: bc56fcff8aa2d3a1d369d91daccb0d419eac4fc3
      https://github.com/phpmyadmin/phpmyadmin/commit/bc56fcff8aa2d3a1d369d91daccb0d419eac4fc3
  Author: Michal Čihař <mcihar at suse.cz>
  Date:   2012-03-29 (Thu, 29 Mar 2012)

  Changed paths:
    M po/ug.po

  Log Message:
  -----------
  Fix format string


  Commit: 4e408a978e930f05a31e91757e79d4b22a4076c4
      https://github.com/phpmyadmin/phpmyadmin/commit/4e408a978e930f05a31e91757e79d4b22a4076c4
  Author: Michal Čihař <mcihar at suse.cz>
  Date:   2012-03-29 (Thu, 29 Mar 2012)

  Changed paths:
    M po/ug.po

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/QA_3_4' into MAINT_3_5_0

Conflicts:
	po/ug.po


  Commit: 2f76c79433cca7795b3dfa98b042abb3e469d9f1
      https://github.com/phpmyadmin/phpmyadmin/commit/2f76c79433cca7795b3dfa98b042abb3e469d9f1
  Author: Michal Čihař <mcihar at suse.cz>
  Date:   2012-03-29 (Thu, 29 Mar 2012)

  Changed paths:
    M po/ug.po

  Log Message:
  -----------
  Merge branch 'MAINT_3_5_0' into QA_3_5


  Commit: a794d67d55ada4a0a70fcf9403ff82ac99446e70
      https://github.com/phpmyadmin/phpmyadmin/commit/a794d67d55ada4a0a70fcf9403ff82ac99446e70
  Author: Michal Čihař <mcihar at suse.cz>
  Date:   2012-03-29 (Thu, 29 Mar 2012)

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/QA_3_5'


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/138306e...a794d67