[asterisk-commits] seanbright: trunk r329951 - in /trunk: ./ apps/app_confbridge.c

[SVN commits to the Asterisk project]

Author: seanbright
Date: Thu Jul 28 07:44:51 2011
New Revision: 329951

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=329951
Log:
Merged revisions 329950 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/10

........
  r329950 | seanbright | 2011-07-28 08:43:55 -0400 (Thu, 28 Jul 2011) | 1 line
  
  Correct the spelling of 'conference.'
........

Modified:
    trunk/   (props changed)
    trunk/apps/app_confbridge.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-10-merged' - no diff available.

Modified: trunk/apps/app_confbridge.c
URL: http://svnview.digium.com/svn/asterisk/trunk/apps/app_confbridge.c?view=diff&rev=329951&r1=329950&r2=329951
==============================================================================
--- trunk/apps/app_confbridge.c (original)
+++ trunk/apps/app_confbridge.c Thu Jul 28 07:44:51 2011
@@ -2623,13 +2623,13 @@
 		return -1;
 	}
 	if (!ao2_container_count(conference_bridges)) {
-		ast_log(LOG_ERROR, "No active conferneces.\n");
+		ast_log(LOG_ERROR, "No active conferences.\n");
 		return -1;
 	}
 	ast_copy_string(tmp.name, args.confno, sizeof(tmp.name));
 	bridge = ao2_find(conference_bridges, &tmp, OBJ_POINTER);
 	if (!bridge) {
-		ast_log(LOG_ERROR, "Confernece '%s' not found.\n", args.confno);
+		ast_log(LOG_ERROR, "Conference '%s' not found.\n", args.confno);
 		return -1;
 	}