Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: dce84310031184f32e4eaddffd2a0ad0c67152ea https://github.com/phpmyadmin/phpmyadmin/commit/dce84310031184f32e4eaddffd2a... Author: Marc Delisle marc@infomarc.info Date: 2012-09-09 (Sun, 09 Sep 2012)

Changed paths: M js/tbl_chart.js

Log Message: ----------- Remove extraneous comma

Commit: 467cd60a002da734dac1d645a7840bf5bdf6e6a6 https://github.com/phpmyadmin/phpmyadmin/commit/467cd60a002da734dac1d645a784... Author: Marc Delisle marc@infomarc.info Date: 2012-09-09 (Sun, 09 Sep 2012)

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

Commit: e491ab1c8accfdf40761ced5a96969c48143dc3f https://github.com/phpmyadmin/phpmyadmin/commit/e491ab1c8accfdf40761ced5a969... Author: Marc Delisle marc@infomarc.info Date: 2012-09-09 (Sun, 09 Sep 2012)

Changed paths: M js/tbl_chart.js

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

Commit: 814166fa7c4e91b4f86e635b36f8e1fcad5319fa https://github.com/phpmyadmin/phpmyadmin/commit/814166fa7c4e91b4f86e635b36f8... Author: Marc Delisle marc@infomarc.info Date: 2012-09-09 (Sun, 09 Sep 2012)

Changed paths: M po/ar.po M po/sr@latin.po

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

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/e53ad4fde761...814166fa7c4e