Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: b82e109d22c541f57c0644a1dd7c89950b99bcc1 https://github.com/phpmyadmin/phpmyadmin/commit/b82e109d22c541f57c0644a1dd7c... Author: Jan Erik Zassenhaus <jan.zassenhaus@jgerman.de> Date: 2013-05-25 (Sat, 25 May 2013) Changed paths: M po/de.po Log Message: ----------- Translated using Weblate (German) Currently translated at 99.9% (2600 of 2603) Commit: e7f8a06b32ee97b3c57c69b9a2ab1559152e494c https://github.com/phpmyadmin/phpmyadmin/commit/e7f8a06b32ee97b3c57c69b9a2ab... Author: Weblate <noreply@weblate.org> Date: 2013-05-25 (Sat, 25 May 2013) Changed paths: M js/server_status_monitor.js Log Message: ----------- Merge remote-tracking branch 'origin/QA_4_0' into QA_4_0 Commit: 2af41d6f589241dcd3cee4bef9fb54cbb3a27c9f https://github.com/phpmyadmin/phpmyadmin/commit/2af41d6f589241dcd3cee4bef9fb... Author: Atul Pratap Singh <atulpratapsingh05@gmail.com> Date: 2013-05-25 (Sat, 25 May 2013) Changed paths: M server_status_monitor.php Log Message: ----------- Rename message in QA_4_0 Commit: dda6b7f0e593fa13ffe84804dca050602f1e026e https://github.com/phpmyadmin/phpmyadmin/commit/dda6b7f0e593fa13ffe84804dca0... Author: Marc Delisle <marc@infomarc.info> Date: 2013-05-25 (Sat, 25 May 2013) Changed paths: M server_status_monitor.php Log Message: ----------- Improve message appearance Commit: 8e29c98ab4a05c83adbbfaabad69a68e83bfeda6 https://github.com/phpmyadmin/phpmyadmin/commit/8e29c98ab4a05c83adbbfaabad69... Author: Marc Delisle <marc@infomarc.info> Date: 2013-05-25 (Sat, 25 May 2013) Log Message: ----------- Merge commit '2af41d6' Commit: 07f94938008ab48da078207281c943987435cd18 https://github.com/phpmyadmin/phpmyadmin/commit/07f94938008ab48da078207281c9... Author: Marc Delisle <marc@infomarc.info> Date: 2013-05-25 (Sat, 25 May 2013) Changed paths: M server_status_monitor.php Log Message: ----------- Fix merge conflicts Compare: https://github.com/phpmyadmin/phpmyadmin/compare/1b8cfc1e01ab...07f94938008a