Branch: refs/heads/QA_3_5 Home: https://github.com/phpmyadmin/phpmyadmin Commit: fed871cd6fd7d03cd8b03d792b93565fcfffd656 https://github.com/phpmyadmin/phpmyadmin/commit/fed871cd6fd7d03cd8b03d792b93... Author: J.M me@mynetx.net Date: 2012-09-04 (Tue, 04 Sep 2012)

Changed paths: M libraries/sysinfo.lib.php

Log Message: ----------- fix SunOS swap calculation

Commit: b136af32921af7767718ddeb38ee45d3a8d6f033 https://github.com/phpmyadmin/phpmyadmin/commit/b136af32921af7767718ddeb38ee... Author: J.M me@mynetx.net Date: 2012-09-04 (Tue, 04 Sep 2012)

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

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

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/ed950a6c1cc2...b136af32921a