Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 2eb50151033d7e5a3740b601d3d929c43f57ade9 https://github.com/phpmyadmin/phpmyadmin/commit/2eb50151033d7e5a3740b601d3d9... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2012-10-20 (Sat, 20 Oct 2012)

Changed paths: M ChangeLog M js/tbl_select.js

Log Message: ----------- Porting fix for bug #3578776 to QA_3_5

Commit: 2124dce1e5c1cb42f3b1225fef380272f79f5197 https://github.com/phpmyadmin/phpmyadmin/commit/2124dce1e5c1cb42f3b1225fef38... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2012-10-20 (Sat, 20 Oct 2012)

Changed paths: M ChangeLog

Log Message: ----------- Merge branch 'QA_3_5'

Conflicts: js/tbl_select.js

Commit: 49d784a5dccbbb363783637afbe030c290b68717 https://github.com/phpmyadmin/phpmyadmin/commit/49d784a5dccbbb363783637afbe0... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2012-10-20 (Sat, 20 Oct 2012)

Changed paths: M po/sl.po

Log Message: ----------- Merge branch 'master' of github.com:phpmyadmin/phpmyadmin

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/734ee71ed033...49d784a5dccb