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

[Michal Čihař]

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

  Changed paths:
    M js/functions.js
  M js/navigation.js
  M js/server_privileges.js
  M js/server_status.js
  M js/server_status_monitor.js
  M js/server_synchronize.js
  M js/tbl_change.js
  M js/tbl_chart.js
  M js/tbl_select.js
  M js/tbl_structure.js
  M js/tbl_zoom_plot.js
  M js/update-location.js

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


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

  Changed paths:
    M libraries/select_lang.lib.php
  A po/kk.po

  Log Message:
  -----------
  Add Kazakh language


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

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


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

  Changed paths:
    M po/fr.po
  M po/si.po
  M po/tr.po

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


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

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


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/7672017...45e105d