Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 35dca4aef4da9ac527036095cc1277c00891f66f https://github.com/phpmyadmin/phpmyadmin/commit/35dca4aef4da9ac527036095cc12... Author: Rodrigo Severo rodrigo@fabricadeideias.com Date: 2013-01-28 (Mon, 28 Jan 2013)

Changed paths: M po/pt_BR.po

Log Message: ----------- Translated using Weblate (Portuguese (Brazil))

Currently translated at 98.5% (2524 of 2562)

Commit: cf067f33a9ec1d052a045dbbc9707f621e936afd https://github.com/phpmyadmin/phpmyadmin/commit/cf067f33a9ec1d052a045dbbc970... Author: Weblate noreply@weblate.org Date: 2013-01-28 (Mon, 28 Jan 2013)

Changed paths: M js/tbl_structure.js

Log Message: ----------- Merge remote-tracking branch 'origin/QA_3_5' into QA_3_5

Commit: 2e627b9ae575f481f0b24574528aa212e60cf356 https://github.com/phpmyadmin/phpmyadmin/commit/2e627b9ae575f481f0b24574528a... Author: Marc Delisle marc@infomarc.info Date: 2013-01-28 (Mon, 28 Jan 2013)

Changed paths: M ChangeLog M Documentation.html M README M libraries/Config.class.php

Log Message: ----------- 3.5.6 release

Commit: 9727db86472f0de709f3cf9d83114516905407bf https://github.com/phpmyadmin/phpmyadmin/commit/9727db86472f0de709f3cf9d8311... Author: Marc Delisle marc@infomarc.info Date: 2013-01-28 (Mon, 28 Jan 2013)

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

Commit: 360a9f4a0c3df7650dafad2199a8022935101182 https://github.com/phpmyadmin/phpmyadmin/commit/360a9f4a0c3df7650dafad2199a8... Author: Marc Delisle marc@infomarc.info Date: 2013-01-28 (Mon, 28 Jan 2013)

Changed paths: M ChangeLog

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

Commit: 8a3f909538382f7a1e434ce9d58015a0b78c469b https://github.com/phpmyadmin/phpmyadmin/commit/8a3f909538382f7a1e434ce9d580... Author: Marc Delisle marc@infomarc.info Date: 2013-01-28 (Mon, 28 Jan 2013)

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

Commit: 70a73190b89e6e16e0681493ec73629a0c1903ce https://github.com/phpmyadmin/phpmyadmin/commit/70a73190b89e6e16e0681493ec73... Author: Marc Delisle marc@infomarc.info Date: 2013-01-28 (Mon, 28 Jan 2013)

Changed paths: M ChangeLog

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

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/2dc656b943a9...70a73190b89e