Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 01d6a06c5294cd71f503fbdd64b41d06b7558bc9 https://github.com/phpmyadmin/phpmyadmin/commit/01d6a06c5294cd71f503fbdd64b4... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2014-10-07 (Tue, 07 Oct 2014)

Changed paths: M libraries/dbi/DBIDummy.class.php

Log Message: ----------- Update Dummy DBI for tests

Signed-off-by: Madhura Jayaratne madhura.cj@gmail.com

Commit: f8c1656affd7b8994319ed56751b7ec59751a9c2 https://github.com/phpmyadmin/phpmyadmin/commit/f8c1656affd7b8994319ed56751b... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2014-10-07 (Tue, 07 Oct 2014)

Log Message: ----------- Merge branch 'QA_4_2'

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/073f748e352d...f8c1656affd7