[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 35ad2e: Typo

[Marc Delisle]

  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 35ad2ea29c1782be6a63b944f454c288c25690f3
      https://github.com/phpmyadmin/phpmyadmin/commit/35ad2ea29c1782be6a63b944f454c288c25690f3
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2012-04-26 (Thu, 26 Apr 2012)

  Changed paths:
    M Documentation.html

  Log Message:
  -----------
  Typo


  Commit: b2236cf3e8a93925d17156bcd6a4d8f5b8f1d450
      https://github.com/phpmyadmin/phpmyadmin/commit/b2236cf3e8a93925d17156bcd6a4d8f5b8f1d450
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2012-04-26 (Thu, 26 Apr 2012)

  Changed paths:
    M Documentation.html

  Log Message:
  -----------
  Fix merge conflicts


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/9f4fb06...b2236cf