From: Continuous Integration <ci@tangent.org>
Date: Thu, 10 Oct 2013 08:07:55 +0000 (-0700)
Subject: Merge lp:~brianaker/libmemcached/1220229 Build: jenkins-Libmemcached-362
X-Git-Tag: 1.0.18~19
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=f9b9a7e7f7a25587bcd2bea5932122510003fcd8;hp=dd1ce96a2171e9a2e13c08e56e22b03008e87367;p=awesomized%2Flibmemcached

Merge lp:~brianaker/libmemcached/1220229 Build: jenkins-Libmemcached-362
---

diff --git a/clients/memtouch.cc b/clients/memtouch.cc
index bf68a3db..09e0c92a 100644
--- a/clients/memtouch.cc
+++ b/clients/memtouch.cc
@@ -24,7 +24,7 @@
 #include "utilities.h"
 
 #define PROGRAM_NAME "memtouch"
-#define PROGRAM_DESCRIPTION "Update the expiration value of an alreasy existing value in the sever"
+#define PROGRAM_DESCRIPTION "Update the expiration value of an already existing value in the server"
 
 
 /* Prototypes */
diff --git a/clients/ms_setting.h b/clients/ms_setting.h
index ec060c41..4bab2b99 100644
--- a/clients/ms_setting.h
+++ b/clients/ms_setting.h
@@ -47,7 +47,7 @@ typedef struct token_s
 #define MAX_TOKENS    10
 
 /* server information */
-typedef struct mcd_sever
+typedef struct mcd_server
 {
   char srv_host_name[MCD_HOST_LENGTH];              /* host name of server */
   int srv_port;                                     /* server port */