Merge branch 'master' into readline

2015-02-23 00:50:58 +00:00
parent 95e7bd5a84 2f4d66ea6e
commit 7454bede8b
11 changed files with 35 additions and 35 deletions
--- a/src/ui/window.c
+++ b/src/ui/window.c
@@ -722,7 +722,7 @@ win_show_info(ProfWin *window, PContact contact)
    if (resources != NULL) {
        win_save_print(window, '-', NULL, 0, 0, "", "Resources:");

-        // sort in order of availabiltiy
+        // sort in order of availability
        GList *curr = resources;
        while (curr != NULL) {
            Resource *resource = curr->data;