[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 6d4aac: bug #4844 FAQ 1.17 needs an update

[Marc Delisle]

  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 6d4aac0853075e9c823bba39d142f928cbc3fa51
      https://github.com/phpmyadmin/phpmyadmin/commit/6d4aac0853075e9c823bba39d142f928cbc3fa51
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2015-07-05 (Sun, 05 Jul 2015)

  Changed paths:
    M ChangeLog
    M doc/faq.rst

  Log Message:
  -----------
  bug #4844 FAQ 1.17 needs an update

Signed-off-by: Marc Delisle <marc at infomarc.info>


  Commit: 3a92a2812e05a5170b4886dd0ec9179f65709963
      https://github.com/phpmyadmin/phpmyadmin/commit/3a92a2812e05a5170b4886dd0ec9179f65709963
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2015-07-05 (Sun, 05 Jul 2015)

  Changed paths:
    M ChangeLog
    M doc/faq.rst

  Log Message:
  -----------
  Merge branch 'QA_4_4'


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/6365442c5e92...3a92a2812e05