[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 5db659: Fixed bad merge

1 May 2012


      Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 5db659bec3b68e636bd22d63877544d6763c207b
      https://github.com/phpmyadmin/phpmyadmin/commit/5db659bec3b68e636bd22d638775...
  Author: Rouslan Placella <rouslan@placella.com>
  Date:   2012-05-01 (Tue, 01 May 2012)

  Changed paths:
    M libraries/header.inc.php

  Log Message:
  -----------
  Fixed bad merge