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

[Michal Čihař]

  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 6de5908cbeab2073150a56537ef3e37892f5562d
      https://github.com/phpmyadmin/phpmyadmin/commit/6de5908cbeab2073150a56537ef3e37892f5562d
  Author: Michal Čihař <mcihar at suse.cz>
  Date:   2012-04-06 (Fri, 06 Apr 2012)

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


  Commit: 671488b7c63fa3b12cb07e69d6bdd385c2858422
      https://github.com/phpmyadmin/phpmyadmin/commit/671488b7c63fa3b12cb07e69d6bdd385c2858422
  Author: Michal Čihař <mcihar at suse.cz>
  Date:   2012-04-06 (Fri, 06 Apr 2012)

  Changed paths:
    M po/de.po
  M po/nl.po

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


  Commit: 26d0eb30af0a6e7b5b854f5ac28d3a351ad69de1
      https://github.com/phpmyadmin/phpmyadmin/commit/26d0eb30af0a6e7b5b854f5ac28d3a351ad69de1
  Author: Michal Čihař <mcihar at suse.cz>
  Date:   2012-04-06 (Fri, 06 Apr 2012)

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


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/ffab042...26d0eb3