Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: d31ce05b914cdcdf99c0e3c178d13f8d5a4f5efe https://github.com/phpmyadmin/phpmyadmin/commit/d31ce05b914cdcdf99c0e3c178d1... Author: Isaac Bennetch bennetch@gmail.com Date: 2015-04-30 (Thu, 30 Apr 2015)

Changed paths: M doc/config.rst

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

Signed-off-by: Isaac Bennetch bennetch@gmail.com

Commit: 8e53cb76995013ed060beb015c92afa6718ba071 https://github.com/phpmyadmin/phpmyadmin/commit/8e53cb76995013ed060beb015c92... Author: Isaac Bennetch bennetch@gmail.com Date: 2015-04-30 (Thu, 30 Apr 2015)

Changed paths: M doc/config.rst

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

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/a17823e898c8...8e53cb769950