Index: channels/chan_sip.c
===================================================================
--- channels/chan_sip.c	(revision 130569)
+++ channels/chan_sip.c	(working copy)
@@ -12895,7 +12895,7 @@
 
 	peer = astman_get_header(m, "Peer");
 	if (ast_strlen_zero(peer)) {
-		astman_send_error(s, m, "Peer: <name> missing.\n");
+		astman_send_error(s, m, "Peer: <name> missing.");
 		return 0;
 	}
 	a[0] = "sip";
@@ -12941,7 +12941,7 @@
 	} else if (type == 0) {
 		ast_cli(fd, "Peer '%s' not found\n", argv[3]);
 	} else {
-		astman_send_error(s, m, "Peer not found\n");
+		astman_send_error(s, m, "Peer not found");
 	}
 	return CLI_SUCCESS;
 }
@@ -12954,7 +12954,7 @@
 
 	peer = astman_get_header(m, "Peer");
 	if (ast_strlen_zero(peer)) {
-		astman_send_error(s, m, "Peer: <name> missing.\n");
+		astman_send_error(s, m, "Peer: <name> missing.");
 		return 0;
 	}
 	a[0] = "sip";
@@ -13026,7 +13026,7 @@
 			if (!ast_strlen_zero(id))
 				astman_append(s, "ActionID: %s\r\n", id);
 		} else {
-			snprintf (cbuf, sizeof(cbuf), "Peer %s not found.\n", argv[3]);
+			snprintf (cbuf, sizeof(cbuf), "Peer %s not found.", argv[3]);
 			astman_send_error(s, m, cbuf);
 			return CLI_SUCCESS;
 		}
Index: apps/app_voicemail.c
===================================================================
--- apps/app_voicemail.c	(revision 130569)
+++ apps/app_voicemail.c	(working copy)
@@ -9338,7 +9338,7 @@
 		return RESULT_SUCCESS;
 	}
 	
-	astman_send_ack(s, m, "Voicemail user list will follow\r\n");
+	astman_send_ack(s, m, "Voicemail user list will follow");
 	
 	AST_LIST_TRAVERSE(&users, vmu, list) {
 		char dirname[256];
Index: main/manager.c
===================================================================
--- main/manager.c	(revision 130569)
+++ main/manager.c	(working copy)
@@ -1971,7 +1971,7 @@
 	}
 	if (!ast_strlen_zero(priority) && (sscanf(priority, "%d", &pi) != 1)) {
 		if ((pi = ast_findlabel_extension(NULL, context, exten, priority, NULL)) < 1) {
-			astman_send_error(s, m, "Invalid priority\n");
+			astman_send_error(s, m, "Invalid priority");
 			return 0;
 		}
 	}
@@ -1984,14 +1984,14 @@
 		return 0;
 	}
 	if (ast_check_hangup(chan)) {
-		astman_send_error(s, m, "Redirect failed, channel not up.\n");
+		astman_send_error(s, m, "Redirect failed, channel not up.");
 		ast_channel_unlock(chan);
 		return 0;
 	}
 	if (!ast_strlen_zero(name2))
 		chan2 = ast_get_channel_by_name_locked(name2);
 	if (chan2 && ast_check_hangup(chan2)) {
-		astman_send_error(s, m, "Redirect failed, extra channel not up.\n");
+		astman_send_error(s, m, "Redirect failed, extra channel not up.");
 		ast_channel_unlock(chan);
 		ast_channel_unlock(chan2);
 		return 0;
@@ -2039,34 +2039,34 @@
 	int priority_int = 0;
 
 	if (ast_strlen_zero(name)) { 
-		astman_send_error(s, m, "No channel specified\n");
+		astman_send_error(s, m, "No channel specified");
 		return 0;
 	}
 	if (ast_strlen_zero(exten)) {
-		astman_send_error(s, m, "No extension specified\n");
+		astman_send_error(s, m, "No extension specified");
 		return 0;
 	}
 	if (ast_strlen_zero(context)) {
-		astman_send_error(s, m, "No context specified\n");
+		astman_send_error(s, m, "No context specified");
 		return 0;
 	}
 	if (ast_strlen_zero(priority)) {
-		astman_send_error(s, m, "No priority specified\n");
+		astman_send_error(s, m, "No priority specified");
 		return 0;
 	}
 
 	if (sscanf(priority, "%d", &priority_int) != 1 && (priority_int = ast_findlabel_extension(NULL, context, exten, priority, NULL)) < 1) {
-		astman_send_error(s, m, "Invalid Priority\n");
+		astman_send_error(s, m, "Invalid Priority");
 		return 0;
 	}
 
 	if (!(atxfer_feature = ast_find_call_feature("atxfer"))) {
-		astman_send_error(s, m, "No attended transfer feature found\n");
+		astman_send_error(s, m, "No attended transfer feature found");
 		return 0;
 	}
 
 	if (!(chan = ast_get_channel_by_name_locked(name))) {
-		astman_send_error(s, m, "Channel specified does not exist\n");
+		astman_send_error(s, m, "Channel specified does not exist");
 		return 0;
 	}
 
@@ -2080,7 +2080,7 @@
 		ast_queue_frame(chan, &f);
 	}
 
-	astman_send_ack(s, m, "Atxfer successfully queued\n");
+	astman_send_ack(s, m, "Atxfer successfully queued");
 	ast_channel_unlock(chan);
 
 	return 0;
@@ -2288,19 +2288,19 @@
 	}
 	if (!ast_strlen_zero(priority) && (sscanf(priority, "%d", &pi) != 1)) {
 		if ((pi = ast_findlabel_extension(NULL, context, exten, priority, NULL)) < 1) {
-			astman_send_error(s, m, "Invalid priority\n");
+			astman_send_error(s, m, "Invalid priority");
 			return 0;
 		}
 	}
 	if (!ast_strlen_zero(timeout) && (sscanf(timeout, "%d", &to) != 1)) {
-		astman_send_error(s, m, "Invalid timeout\n");
+		astman_send_error(s, m, "Invalid timeout");
 		return 0;
 	}
 	ast_copy_string(tmp, name, sizeof(tmp));
 	tech = tmp;
 	data = strchr(tmp, '/');
 	if (!data) {
-		astman_send_error(s, m, "Invalid channel\n");
+		astman_send_error(s, m, "Invalid channel");
 		return 0;
 	}
 	*data++ = '\0';
Index: main/pbx.c
===================================================================
--- main/pbx.c	(revision 130569)
+++ main/pbx.c	(working copy)
@@ -5192,7 +5192,7 @@
 
 	/* try to lock contexts */
 	if (ast_rdlock_contexts()) {
-		astman_send_error(s, m, "Failed to lock contexts\r\n");
+		astman_send_error(s, m, "Failed to lock contexts");
 		ast_log(LOG_WARNING, "Failed to lock contexts list for manager: listdialplan\n");
 		return -1;
 	}
@@ -5337,7 +5337,7 @@
 	if (context && !counters.context_existence) {
 		char errorbuf[BUFSIZ];
 	
-		snprintf(errorbuf, sizeof(errorbuf), "Did not find context %s\r\n", context);
+		snprintf(errorbuf, sizeof(errorbuf), "Did not find context %s", context);
 		astman_send_error(s, m, errorbuf);
 		return 0;
 	}
@@ -5345,9 +5345,9 @@
 		char errorbuf[BUFSIZ];
 
 		if (context)
-			snprintf(errorbuf, sizeof(errorbuf), "Did not find extension %s@%s\r\n", exten, context);
+			snprintf(errorbuf, sizeof(errorbuf), "Did not find extension %s@%s", exten, context);
 		else
-			snprintf(errorbuf, sizeof(errorbuf), "Did not find extension %s in any context\r\n", exten);
+			snprintf(errorbuf, sizeof(errorbuf), "Did not find extension %s in any context", exten);
 		astman_send_error(s, m, errorbuf);
 		return 0;
 	}