Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 7d26b2074fe83bde7cbebf986e23f85e0c28f55c https://github.com/phpmyadmin/phpmyadmin/commit/7d26b2074fe83bde7cbebf986e23... Author: Jere Vainionpää <jermakovi@hotmail.fi> Date: 2012-12-09 (Sun, 09 Dec 2012) Changed paths: M po/fi.po Log Message: ----------- Translated using Weblate (Finnish) Currently translated at 74.2% (1902 of 2562) Commit: 584c52820378b589198756cad240dda1bbe3710b https://github.com/phpmyadmin/phpmyadmin/commit/584c52820378b589198756cad240... Author: Marc Delisle <marc@infomarc.info> Date: 2012-12-12 (Wed, 12 Dec 2012) Changed paths: M ChangeLog M tbl_tracking.php Log Message: ----------- bug #3593534 [tracking] Structure Snapshot on tracked view renders invalid SQL Commit: 018974d16864062be45e4694f21de612dc299b3f https://github.com/phpmyadmin/phpmyadmin/commit/018974d16864062be45e4694f21d... Author: Marc Delisle <marc@infomarc.info> Date: 2012-12-12 (Wed, 12 Dec 2012) Log Message: ----------- Merge branch 'QA_3_5' Commit: 72eaf6d33895a1df7a9e60bb6ab35b6663247d06 https://github.com/phpmyadmin/phpmyadmin/commit/72eaf6d33895a1df7a9e60bb6ab3... Author: Marc Delisle <marc@infomarc.info> Date: 2012-12-12 (Wed, 12 Dec 2012) Changed paths: M ChangeLog M tbl_tracking.php Log Message: ----------- Fix merge conflicts Compare: https://github.com/phpmyadmin/phpmyadmin/compare/da53f393ab1f...72eaf6d33895