[Phpmyadmin-git] [phpmyadmin/phpmyadmin] d8134c: RFE#706: Multi-db privileges adding.

[Marc Delisle]

  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: d8134c911696b60b408f3fa1a3386aa08d8292a7
      https://github.com/phpmyadmin/phpmyadmin/commit/d8134c911696b60b408f3fa1a3386aa08d8292a7
  Author: Ashutosh Dhundhara <ashutoshdhundhara at yahoo.com>
  Date:   2014-05-25 (Sun, 25 May 2014)

  Changed paths:
    M ChangeLog
    M libraries/server_privileges.lib.php
    M server_privileges.php
    M test/libraries/PMA_server_privileges_test.php

  Log Message:
  -----------
  RFE#706: Multi-db privileges adding.

Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara at yahoo.com>


  Commit: 51b6fc08f3bc3186d4ed4246d7a8d6a22ec2bb3e
      https://github.com/phpmyadmin/phpmyadmin/commit/51b6fc08f3bc3186d4ed4246d7a8d6a22ec2bb3e
  Author: Ashutosh Dhundhara <ashutoshdhundhara at yahoo.com>
  Date:   2014-05-25 (Sun, 25 May 2014)

  Changed paths:
    M ChangeLog
    M js/makegrid.js
    M js/messages.php
    M libraries/DisplayResults.class.php
    M libraries/core.lib.php
    M po/af.po
    M po/ar.po
    M po/az.po
    M po/be.po
    M po/be at latin.po
    M po/bg.po
    M po/bn.po
    M po/br.po
    M po/bs.po
    M po/ca.po
    M po/ckb.po
    M po/cs.po
    M po/cy.po
    M po/da.po
    M po/de.po
    M po/el.po
    M po/en_GB.po
    M po/es.po
    M po/et.po
    M po/eu.po
    M po/fa.po
    M po/fi.po
    M po/fr.po
    M po/gl.po
    M po/he.po
    M po/hi.po
    M po/hr.po
    M po/hu.po
    M po/hy.po
    M po/ia.po
    M po/id.po
    M po/it.po
    M po/ja.po
    M po/ka.po
    M po/kk.po
    M po/km.po
    M po/kn.po
    M po/ko.po
    M po/ksh.po
    M po/ky.po
    M po/lt.po
    M po/lv.po
    M po/mk.po
    M po/ml.po
    M po/mn.po
    M po/ms.po
    M po/nb.po
    M po/nl.po
    M po/pa.po
    M po/phpmyadmin.pot
    M po/pl.po
    M po/pt.po
    M po/pt_BR.po
    M po/ro.po
    M po/ru.po
    M po/si.po
    M po/sk.po
    M po/sl.po
    M po/sq.po
    M po/sr.po
    M po/sr at latin.po
    M po/sv.po
    M po/ta.po
    M po/te.po
    M po/th.po
    M po/tk.po
    M po/tr.po
    M po/tt.po
    M po/ug.po
    M po/uk.po
    M po/ur.po
    M po/uz.po
    M po/uz at latin.po
    M po/vls.po
    M po/zh_CN.po
    M po/zh_TW.po
    M test/classes/PMA_DisplayResults_test.php

  Log Message:
  -----------
  Fix merge conflict.

Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara at yahoo.com>

Conflicts:
	ChangeLog


  Commit: 1380cf15f2bbca599a32deaf2aee7e861d7458f4
      https://github.com/phpmyadmin/phpmyadmin/commit/1380cf15f2bbca599a32deaf2aee7e861d7458f4
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-05-25 (Sun, 25 May 2014)

  Changed paths:
    M ChangeLog
    M libraries/server_privileges.lib.php
    M server_privileges.php
    M test/libraries/PMA_server_privileges_test.php

  Log Message:
  -----------
  Merge pull request #1194 from ashutoshdhundhara/rfe_706

RFE#706: Multi-db privileges adding.


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/c662d6cebf75...1380cf15f2bb