[phpMyAdmin Git] [phpmyadmin/phpmyadmin] dade3f: Fix #11706 Database export template not saving com...

[Madhura Jayaratne]

  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: dade3fa2e4a98008a828151d63b756380e1d6a56
      https://github.com/phpmyadmin/phpmyadmin/commit/dade3fa2e4a98008a828151d63b756380e1d6a56
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2015-12-07 (Mon, 07 Dec 2015)

  Changed paths:
    M ChangeLog
    M js/export.js

  Log Message:
  -----------
  Fix #11706 Database export template not saving compression option

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


  Commit: 0375802fc0808e493e3f3ba3b186685a93f4ca3d
      https://github.com/phpmyadmin/phpmyadmin/commit/0375802fc0808e493e3f3ba3b186685a93f4ca3d
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2015-12-07 (Mon, 07 Dec 2015)

  Changed paths:
    M ChangeLog
    M libraries/DatabaseInterface.class.php
    M po/ia.po
    M po/tr.po
    R scripts/decode_bug.php

  Log Message:
  -----------
  Merge branch 'QA_4_5' of github.com:phpmyadmin/phpmyadmin into QA_4_5

Conflicts:
	ChangeLog


  Commit: 74c651e4d8ad5cc2997fee1e2d26b30ac118cbd0
      https://github.com/phpmyadmin/phpmyadmin/commit/74c651e4d8ad5cc2997fee1e2d26b30ac118cbd0
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2015-12-07 (Mon, 07 Dec 2015)

  Changed paths:
    M ChangeLog
    M js/export.js

  Log Message:
  -----------
  Merge branch 'QA_4_5'


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/40644b5c330e...74c651e4d8ad