Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 6fe98b7a0b0c055023a315ed12b41a77493acb21 https://github.com/phpmyadmin/phpmyadmin/commit/6fe98b7a0b0c055023a315ed12b4... 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: ----------- Fix an extraneous change from 0af8c39

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

Commit: 9b0608474bd1d14b198e5e03cf5e39fdd39850ba https://github.com/phpmyadmin/phpmyadmin/commit/9b0608474bd1d14b198e5e03cf5e... 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'

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/5412dd6e16cc...9b0608474bd1