Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 0af8c39481e5cb598e186307f18eef252f76be93 https://github.com/phpmyadmin/phpmyadmin/commit/0af8c39481e5cb598e186307f18e... Author: Deven Bansod devenbansod.bits@gmail.com Date: 2015-12-20 (Sun, 20 Dec 2015)

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

Log Message: ----------- Update the queries used in DBIDummy

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

Commit: 5412dd6e16cc87e7f51e8a4f93133934300b023d https://github.com/phpmyadmin/phpmyadmin/commit/5412dd6e16cc87e7f51e8a4f9313... Author: Deven Bansod devenbansod.bits@gmail.com Date: 2015-12-20 (Sun, 20 Dec 2015)

Changed paths: M libraries/dbi/DBIDummy.php

Log Message: ----------- Merge branch 'QA_4_5'

Conflicts: libraries/dbi/DBIDummy.php

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/52f326c98b16...5412dd6e16cc