Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 7f01d29b23204b793a96cd2b269e82eadd1b5fd7 https://github.com/phpmyadmin/phpmyadmin/commit/7f01d29b23204b793a96cd2b269e... Author: Marc Delisle marc@infomarc.info Date: 2013-05-25 (Sat, 25 May 2013)

Changed paths: M po/fr.po

Log Message: ----------- Translate

Commit: 0a11401219312ffac55e5b24cbfae93f79684463 https://github.com/phpmyadmin/phpmyadmin/commit/0a11401219312ffac55e5b24cbfa... Author: Marc Delisle marc@infomarc.info Date: 2013-05-25 (Sat, 25 May 2013)

Changed paths: M libraries/Config.class.php

Log Message: ----------- Fix typo

Commit: 3b18973b70f362654c794788ab77adcc11722cfe https://github.com/phpmyadmin/phpmyadmin/commit/3b18973b70f362654c794788ab77... Author: Marc Delisle marc@infomarc.info Date: 2013-05-25 (Sat, 25 May 2013)

Log Message: ----------- Merge commit '7f01d29'

Commit: 33507c33142f5dfb1fc6474cc19abe89f39916db https://github.com/phpmyadmin/phpmyadmin/commit/33507c33142f5dfb1fc6474cc19a... Author: Marc Delisle marc@infomarc.info Date: 2013-05-25 (Sat, 25 May 2013)

Changed paths: M libraries/Config.class.php

Log Message: ----------- Merge branch 'QA_4_0'

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/5bcb13e5770e...33507c33142f