Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: af0e34e2743181f8f7861dc203e15cace475a24b https://github.com/phpmyadmin/phpmyadmin/commit/af0e34e2743181f8f7861dc203e1... Author: Atul Pratap Singh atulpratapsingh05@gmail.com Date: 2012-09-22 (Sat, 22 Sep 2012)

Changed paths: A js/jqplot/excanvas.js M server_status.php

Log Message: ----------- Fix jqplot charts display in IE versions less than 9

Commit: d1a7a8560abfab256e9874261f9c52770e43cc78 https://github.com/phpmyadmin/phpmyadmin/commit/d1a7a8560abfab256e9874261f9c... Author: Atul Pratap Singh atulpratapsingh05@gmail.com Date: 2012-09-22 (Sat, 22 Sep 2012)

Changed paths: A js/jqplot/excanvas.js M server_status.php

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

Commit: 0034213a1bf1c2789d65e1f2efacae2fb708fe23 https://github.com/phpmyadmin/phpmyadmin/commit/0034213a1bf1c2789d65e1f2efac... Author: Marc Delisle marc@infomarc.info Date: 2012-09-22 (Sat, 22 Sep 2012)

Changed paths: A js/jqplot/excanvas.js M server_status.php

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

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/9671e65dac58...0034213a1bf1