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

[Michal Čihař]

  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 04541368fb1dedce0bb6bd445121cb4171ee4f1c
      https://github.com/phpmyadmin/phpmyadmin/commit/04541368fb1dedce0bb6bd445121cb4171ee4f1c
  Author: Michal Čihař <weblate at l10n.cihar.com>
  Date:   2012-03-09 (Fri, 09 Mar 2012)

  Changed paths:
    M server_privileges.php

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


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

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


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

  Changed paths:
    M po/pl.po
  M po/zh_CN.po

  Log Message:
  -----------
  Merge remote-tracking branch 'weblate/QA_3_5' into QA_3_5


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

  Changed paths:
    M po/zh_CN.po

  Log Message:
  -----------
  Fix new line


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

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


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

  Changed paths:
    M po/pl.po
  M po/zh_CN.po

  Log Message:
  -----------
  Merge remote-tracking branch 'weblate/master'


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

  Changed paths:
    M po/zh_CN.po

  Log Message:
  -----------
  Fix new line


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/3968110...76b96f9