automerge commit

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@29433 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/apps/app_meetme.c b/apps/app_meetme.c
index a8db48d7f7dc097700e9c75071b620293f5181cb..129a5715787f45c594063fed872882e2ccc1f3f5 100644 (file)
--- 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 7cd94e6d2d0a56a7bc99c010e81d86afbf531b25..3e0c417243d05a2793bb1bfe3b073107f151c0ff 100644 (file)
--- 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;