Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: e4fe53217eb023c7d98ed0d512fd13b0ab9ec201 https://github.com/phpmyadmin/phpmyadmin/commit/e4fe53217eb023c7d98ed0d512fd... Author: Deven Bansod devenbansod.bits@gmail.com Date: 2016-10-27 (Thu, 27 Oct 2016)

Changed paths: M libraries/Footer.php

Log Message: ----------- Try adding query to history only if Database links are available

Fix #12661

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

Commit: c5d3b0bbb0c4bd21c9af601a0f623e0c2fb00691 https://github.com/phpmyadmin/phpmyadmin/commit/c5d3b0bbb0c4bd21c9af601a0f62... Author: Deven Bansod devenbansod.bits@gmail.com Date: 2016-10-27 (Thu, 27 Oct 2016)

Changed paths: M po/el.po M po/it.po M po/nl.po M po/tr.po

Log Message: ----------- Merge branch 'QA_4_6' of https://github.com/phpmyadmin/phpmyadmin into QA_4_6

Commit: 368b74bad68b054946ed7044c5e5d783ed5a8cea https://github.com/phpmyadmin/phpmyadmin/commit/368b74bad68b054946ed7044c5e5... Author: Deven Bansod devenbansod.bits@gmail.com Date: 2016-10-27 (Thu, 27 Oct 2016)

Changed paths: M ChangeLog

Log Message: ----------- ChangeLog for #12661

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

Commit: 24aee3758d89924e7fb6d37175429b14e581ab49 https://github.com/phpmyadmin/phpmyadmin/commit/24aee3758d89924e7fb6d3717542... Author: Deven Bansod devenbansod.bits@gmail.com Date: 2016-10-27 (Thu, 27 Oct 2016)

Changed paths: M ChangeLog M libraries/Footer.php

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

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/e8946e4824e0...24aee3758d89