Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: ea619794e54bdcd269f504440491ce1848eb6bb3 https://github.com/phpmyadmin/phpmyadmin/commit/ea619794e54bdcd269f504440491... Author: Isaac Bennetch bennetch@gmail.com Date: 2016-12-17 (Sat, 17 Dec 2016)

Changed paths: M doc/faq.rst

Log Message: ----------- Fix documentation markup

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

Commit: 33af5ac3d6e2fdd0a9fa9730ded87190e0f38294 https://github.com/phpmyadmin/phpmyadmin/commit/33af5ac3d6e2fdd0a9fa9730ded8... Author: Deven Bansod devenbansod.bits@gmail.com Date: 2016-12-19 (Mon, 19 Dec 2016)

Changed paths: M phpunit.xml.dist

Log Message: ----------- Uncomment mistakenly commented Selenium testing setting

Signed-off-by: Deven Bansod devenbansod.bits@gmail.com

Commit: a8018c2fa105221180293c7a15966e2a067d8120 https://github.com/phpmyadmin/phpmyadmin/commit/a8018c2fa105221180293c7a1596... Author: Deven Bansod devenbansod.bits@gmail.com Date: 2016-12-19 (Mon, 19 Dec 2016)

Changed paths: M doc/faq.rst M phpunit.xml.dist

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

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/2a6b05d965b3...a8018c2fa105