[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 80259f: Fix typo

[Madhura Jayaratne]

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

  Changed paths:
    M test/bootstrap-dist.php

  Log Message:
  -----------
  Fix typo

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


  Commit: 271b47956acc2853faa5d3ab0521d221a601a407
      https://github.com/phpmyadmin/phpmyadmin/commit/271b47956acc2853faa5d3ab0521d221a601a407
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2015-07-13 (Mon, 13 Jul 2015)

  Changed paths:
    M ChangeLog
    M js/makegrid.js

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


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/7f7e45de6b0b...271b47956acc