Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 62b36292d4dd58f3249a2ba2033a05e28b85469a https://github.com/phpmyadmin/phpmyadmin/commit/62b36292d4dd58f3249a2ba2033a... Author: Michal Čihař mcihar@suse.cz Date: 2012-09-06 (Thu, 06 Sep 2012)

Changed paths: M libraries/common.lib.php

Log Message: ----------- Revert "Remove not needed code"

This reverts commit 9bb996ef04a9e930fab59979184d839588d52915.

Commit: e12cd648b0fc45602a2a74cde4e99a16aede9b47 https://github.com/phpmyadmin/phpmyadmin/commit/e12cd648b0fc45602a2a74cde4e9... Author: Michal Čihař mcihar@suse.cz Date: 2012-09-06 (Thu, 06 Sep 2012)

Changed paths: M libraries/CommonFunctions.class.php

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

Conflicts: libraries/common.lib.php

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/3ff0568339d5...e12cd648b0fc