Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 99ef493ebba9529b88d50087c44a91de8b386878 https://github.com/phpmyadmin/phpmyadmin/commit/99ef493ebba9529b88d50087c44a... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2014-11-19 (Wed, 19 Nov 2014)

Changed paths: M ChangeLog M index.php

Log Message: ----------- bug #4057 db/table query string parameters no longer work

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

Commit: 783e28f1608012c790cf6e1cb04e717a21019bbd https://github.com/phpmyadmin/phpmyadmin/commit/783e28f1608012c790cf6e1cb04e... Author: Marc Delisle marc@infomarc.info Date: 2014-11-22 (Sat, 22 Nov 2014)

Changed paths: M ChangeLog M index.php

Log Message: ----------- Fix merge conflict

Signed-off-by: Marc Delisle marc@infomarc.info

Commit: 02fcb6e7460818643a458e5a2791ebe1b5a52a49 https://github.com/phpmyadmin/phpmyadmin/commit/02fcb6e7460818643a458e5a2791... Author: Marc Delisle marc@infomarc.info Date: 2014-11-22 (Sat, 22 Nov 2014)

Changed paths: M index.php

Log Message: ----------- Add FAQ reference

Signed-off-by: Marc Delisle marc@infomarc.info

Commit: 9af3635c2627b071bd84145e3f0639a432ca7711 https://github.com/phpmyadmin/phpmyadmin/commit/9af3635c2627b071bd84145e3f06... Author: Marc Delisle marc@infomarc.info Date: 2014-11-22 (Sat, 22 Nov 2014)

Changed paths: M ChangeLog M index.php

Log Message: ----------- Fix merge conflicts

Signed-off-by: Marc Delisle marc@infomarc.info

Commit: 0489e3248dde1fba7d14d2c9121e7bce6d99c0d9 https://github.com/phpmyadmin/phpmyadmin/commit/0489e3248dde1fba7d14d2c9121e... Author: Marc Delisle marc@infomarc.info Date: 2014-11-22 (Sat, 22 Nov 2014)

Log Message: ----------- Merge commit '783e28f' into QA_4_3

Commit: ed6ba4210f3de49b7d49d09a84d8f964d2b42701 https://github.com/phpmyadmin/phpmyadmin/commit/ed6ba4210f3de49b7d49d09a84d8... Author: Marc Delisle marc@infomarc.info Date: 2014-11-22 (Sat, 22 Nov 2014)

Changed paths: M index.php

Log Message: ----------- Fix merge conflict

Signed-off-by: Marc Delisle marc@infomarc.info

Commit: 15d7b17e807195147bfd899cd03bae026060d272 https://github.com/phpmyadmin/phpmyadmin/commit/15d7b17e807195147bfd899cd03b... Author: Marc Delisle marc@infomarc.info Date: 2014-11-22 (Sat, 22 Nov 2014)

Changed paths: M ChangeLog M index.php

Log Message: ----------- Merge branch 'QA_4_3'

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/d8f1c3446bc9...15d7b17e8071