[Phpmyadmin-git] [phpmyadmin/phpmyadmin] c898f6: Ignore not set transformation (only MIME type set)

[Michal Čihař]

  Branch: refs/heads/QA_3_5
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: c898f606413f4f19d0eea2b8e0a2083138f7d1a0
      https://github.com/phpmyadmin/phpmyadmin/commit/c898f606413f4f19d0eea2b8e0a2083138f7d1a0
  Author: Michal Čihař <mcihar at suse.cz>
  Date:   2012-02-08 (Wed, 08 Feb 2012)

  Changed paths:
    M sql.php

  Log Message:
  -----------
  Ignore not set transformation (only MIME type set)


  Commit: 3a76f80009a8dc4634e0d0ce768924fa7e6f6995
      https://github.com/phpmyadmin/phpmyadmin/commit/3a76f80009a8dc4634e0d0ce768924fa7e6f6995
  Author: Michal Čihař <mcihar at suse.cz>
  Date:   2012-02-08 (Wed, 08 Feb 2012)

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

Conflicts:
	sql.php


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/de1dda7...3a76f80