Merge branch 'master' into roomconfig

2014-09-07 22:36:05 +01:00
parent 14ede0e44c b69c9aad87
commit aeca03d348
1 changed files with 1 additions and 1 deletions
--- a/src/server_events.c
+++ b/src/server_events.c
@@ -608,6 +608,6 @@ handle_ping_error_result(const char * const from, const char * const error)
    if (error == NULL) {
        cons_show_error("Error returned from pinging %s.", from);
    } else {
-        cons_show_error("Error returned form pinging %s: %s.", from, error);
+        cons_show_error("Error returned from pinging %s: %s.", from, error);
    }
 }