[Phpmyadmin-git] [phpmyadmin/phpmyadmin] f9deae: Fixed merge conflicts

7 Dec 2012


      Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: f9deae4e3f32aa87834cf911d43177e802e0b476
      https://github.com/phpmyadmin/phpmyadmin/commit/f9deae4e3f32aa87834cf911d431...
  Author: Rouslan Placella <rouslan@placella.com>
  Date:   2012-12-07 (Fri, 07 Dec 2012)

  Changed paths:
    M js/functions.js

  Log Message:
  -----------
  Fixed merge conflicts