Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 141c455d8fe1d4dd3f6feafc6c37f5d98fddcc4a https://github.com/phpmyadmin/phpmyadmin/commit/141c455d8fe1d4dd3f6feafc6c37... Author: Isaac Bennetch bennetch@gmail.com Date: 2016-04-07 (Thu, 07 Apr 2016)

Changed paths: M doc/setup.rst

Log Message: ----------- Minor grammar fix

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

Commit: 015cabec481f8404d80527fc8539cb68c772b369 https://github.com/phpmyadmin/phpmyadmin/commit/015cabec481f8404d80527fc8539... Author: Isaac Bennetch bennetch@gmail.com Date: 2016-04-07 (Thu, 07 Apr 2016)

Changed paths: M doc/setup.rst

Log Message: ----------- Merge branch 'QA_4_6'

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/9d57ab4f2b37...015cabec481f