[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 843f1d: Merge remote-tracking branch 'origin/QA_3_4' into ...

[Jo Michael]

  Branch: refs/heads/QA_3_4
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 843f1d0a89718d9d61e5d642313d84cb35c8806a
      https://github.com/phpmyadmin/phpmyadmin/commit/843f1d0a89718d9d61e5d642313d84cb35c8806a
  Author: Michal Čihař <weblate at l10n.cihar.com>
  Date:   2012-03-10 (Sat, 10 Mar 2012)

  Changed paths:
    M changelog.php

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


  Commit: c6969876ffc85ea9ef8568878b6ee36d5a64b3a3
      https://github.com/phpmyadmin/phpmyadmin/commit/c6969876ffc85ea9ef8568878b6ee36d5a64b3a3
  Author: Jo Michael <me at mynetx.net>
  Date:   2012-03-11 (Sun, 11 Mar 2012)

  Changed paths:
    M po/de.po

  Log Message:
  -----------
  Translated using Weblate.


  Commit: d5bc2433496c36c4a774d5c58da5ca34fd61f615
      https://github.com/phpmyadmin/phpmyadmin/commit/d5bc2433496c36c4a774d5c58da5ca34fd61f615
  Author: Jo Michael <me at mynetx.net>
  Date:   2012-03-11 (Sun, 11 Mar 2012)

  Changed paths:
    M po/de.po

  Log Message:
  -----------
  Translated using Weblate.


  Commit: 3b47a8116d74037d2c2ab91cf830150d32c04d9d
      https://github.com/phpmyadmin/phpmyadmin/commit/3b47a8116d74037d2c2ab91cf830150d32c04d9d
  Author: Jo Michael <me at mynetx.net>
  Date:   2012-03-11 (Sun, 11 Mar 2012)

  Changed paths:
    M po/de.po

  Log Message:
  -----------
  Translated using Weblate.


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/fcadb7a...3b47a81