[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 20fedf: Merge remote-tracking branch 'origin/master'

[Michal Čihař]

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

  Changed paths:
    M db_operations.php
  M import_status.php
  M libraries/schema/Pdf_Relation_Schema.class.php
  M themes/pmahomme/css/theme_left.css.php
  M themes/pmahomme/css/theme_print.css.php
  M themes/pmahomme/css/theme_right.css.php
  M themes/pmahomme/layout.inc.php
  M themes/sprites.css.php

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


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

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


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

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


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/0e337c0...397af99