[phpMyAdmin Git] [phpmyadmin/phpmyadmin] 37b384: 4.6.0 release

[Madhura Jayaratne]

  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 37b38431d167915675fc8ab512470528147e72de
      https://github.com/phpmyadmin/phpmyadmin/commit/37b38431d167915675fc8ab512470528147e72de
  Author: Isaac Bennetch <bennetch at gmail.com>
  Date:   2016-03-17 (Thu, 17 Mar 2016)

  Changed paths:
    M ChangeLog
    M README
    M doc/conf.py
    M libraries/Config.php

  Log Message:
  -----------
  4.6.0 release

Signed-off-by: Isaac Bennetch <bennetch at gmail.com>


  Commit: 51443ae8ff43bd26241a5f9eeed558bac0bc4248
      https://github.com/phpmyadmin/phpmyadmin/commit/51443ae8ff43bd26241a5f9eeed558bac0bc4248
  Author: Tobias Bannert <tobannert at gmail.com>
  Date:   2016-03-22 (Tue, 22 Mar 2016)

  Changed paths:
    M po/de.po

  Log Message:
  -----------
  Translated using Weblate (German)

Currently translated at 100.0% (3211 of 3211 strings)

[CI skip]


  Commit: 0f022341a223c69437a4c1128d7ebc173189507a
      https://github.com/phpmyadmin/phpmyadmin/commit/0f022341a223c69437a4c1128d7ebc173189507a
  Author: Eshin Kunishima <ek at esh.ink>
  Date:   2016-03-22 (Tue, 22 Mar 2016)

  Changed paths:
    M po/ja.po

  Log Message:
  -----------
  Translated using Weblate (Japanese)

Currently translated at 67.3% (2163 of 3211 strings)

[CI skip]


  Commit: be3137c77af2b029ad349d9bca80bcd72b369f04
      https://github.com/phpmyadmin/phpmyadmin/commit/be3137c77af2b029ad349d9bca80bcd72b369f04
  Author: Weblate <noreply at weblate.org>
  Date:   2016-03-22 (Tue, 22 Mar 2016)

  Changed paths:
    M ChangeLog
    M libraries/Table.php

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


  Commit: d83a7a7a81e72088fe679f7ae79c936e4f8106f9
      https://github.com/phpmyadmin/phpmyadmin/commit/d83a7a7a81e72088fe679f7ae79c936e4f8106f9
  Author: Chan Je Park <ejnahc at gmail.com>
  Date:   2016-03-22 (Tue, 22 Mar 2016)

  Changed paths:
    M po/ko.po

  Log Message:
  -----------
  Translated using Weblate (Korean)

Currently translated at 78.0% (2507 of 3211 strings)

[CI skip]


  Commit: 4def458ad7dae92bd0357a482035809763922671
      https://github.com/phpmyadmin/phpmyadmin/commit/4def458ad7dae92bd0357a482035809763922671
  Author: Weblate <noreply at weblate.org>
  Date:   2016-03-22 (Tue, 22 Mar 2016)

  Changed paths:
    M ChangeLog
    M README
    M doc/conf.py
    M libraries/Config.php

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


  Commit: c9dd2e8a78f198107ec86dbd86cc6d259cbcc576
      https://github.com/phpmyadmin/phpmyadmin/commit/c9dd2e8a78f198107ec86dbd86cc6d259cbcc576
  Author: Isaac Bennetch <bennetch at gmail.com>
  Date:   2016-03-17 (Thu, 17 Mar 2016)

  Changed paths:
    M ChangeLog
    M README
    M doc/conf.py
    M libraries/Config.php

  Log Message:
  -----------
  Prepare for 4.6.1-dev

Signed-off-by: Isaac Bennetch <bennetch at gmail.com>


  Commit: 7a444c2f170641ce88c72d6087b03dd5aa0e3682
      https://github.com/phpmyadmin/phpmyadmin/commit/7a444c2f170641ce88c72d6087b03dd5aa0e3682
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2016-03-24 (Thu, 24 Mar 2016)

  Changed paths:
    M ChangeLog
    M libraries/insert_edit.lib.php

  Log Message:
  -----------
  Fix #12120 PMA_Util not found in insert_edit.lib.php

Signed-off-by: Madhura Jayaratne <madhura.cj at gmail.com>


  Commit: 6b84c576c78a04e01abc427d1039ce92824d0476
      https://github.com/phpmyadmin/phpmyadmin/commit/6b84c576c78a04e01abc427d1039ce92824d0476
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2016-03-24 (Thu, 24 Mar 2016)

  Changed paths:
    M ChangeLog
    M libraries/insert_edit.lib.php

  Log Message:
  -----------
  Merge branch 'QA_4_6'

Conflicts:
	ChangeLog
	README
	doc/conf.py
	libraries/Config.php


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/52d10a6b1ac6...6b84c576c78a