Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 8cd420ac945cc2b3dca022536fe00f3a3d282cdd https://github.com/phpmyadmin/phpmyadmin/commit/8cd420ac945cc2b3dca022536fe0... Author: Atul Pratap Singh atulpratapsingh05@gmail.com Date: 2013-05-25 (Sat, 25 May 2013)

Changed paths: M libraries/common.inc.php M sql.php

Log Message: ----------- Remove duplicate code, profiling scripts already included

Commit: 51651ea74adb5241584689f1e94451eb9ee82c2f https://github.com/phpmyadmin/phpmyadmin/commit/51651ea74adb5241584689f1e944... Author: Atul Pratap Singh atulpratapsingh05@gmail.com Date: 2013-05-25 (Sat, 25 May 2013)

Changed paths: M libraries/sql.lib.php

Log Message: ----------- Fix sorting in new profiling tables

Commit: 1b8cfc1e01ab12bd3dc1488002015085bb7ccf61 https://github.com/phpmyadmin/phpmyadmin/commit/1b8cfc1e01ab12bd3dc148800201... Author: Atul Pratap Singh atulpratapsingh05@gmail.com Date: 2013-05-25 (Sat, 25 May 2013)

Changed paths: M po/fr.po

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

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/d6665d319d41...1b8cfc1e01ab