automerge commit

git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@29433 f38db490-d61c-443f-a65b-d21fe96a405b

2 files changed, 2 insertions, 2 deletions

diff --git a/apps/app_meetme.c b/apps/app_meetme.c
index a8db48d7f..129a57157 100644
--- a/apps/app_meetme.c
+++ b/apps/app_meetme.c
@@ -627,7 +627,7 @@ static int conf_cmd(int fd, int argc, char **argv) {
 				user->chan->name,
 				user->userflags & CONFFLAG_ADMIN ? "(Admin)" : "",
 				user->userflags & CONFFLAG_MONITOR ? "(Listen only)" : "",
-				user->adminflags & ADMINFLAG_MUTED ? "(Admn Muted)" : "",
+				user->adminflags & ADMINFLAG_MUTED ? "(Admin Muted)" : "",
 				istalking(user->talking));
 		ast_cli(fd,"%d users in that conference.\n",cnf->users);
 
diff --git a/pbx.c b/pbx.c
index 7cd94e6d2..3e0c41724 100644
--- a/pbx.c
+++ b/pbx.c
@@ -4064,7 +4064,7 @@ static unsigned int get_month(char *mon)
 	}
 	if (c) {
 		e = 0;
-		while((e < 12) && strcasecmp(mon, months[e])) e++;
+		while((e < 12) && strcasecmp(c, months[e])) e++;
 		if (e >= 12) {
 			ast_log(LOG_WARNING, "Invalid month '%s', assuming none\n", c);
 			return 0;