[asterisk-commits] lmadsen: trunk r324177 - in /trunk: ./ apps/app_meetme.c

[SVN commits to the Asterisk project]

Author: lmadsen
Date: Fri Jun 17 13:39:26 2011
New Revision: 324177

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

........
  r324176 | lmadsen | 2011-06-17 14:38:40 -0400 (Fri, 17 Jun 2011) | 2 lines
  
  Fix typo in documentation.
  Pointed out by Vlad Povorozniuc
........

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

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

Modified: trunk/apps/app_meetme.c
URL: http://svnview.digium.com/svn/asterisk/trunk/apps/app_meetme.c?view=diff&rev=324177&r1=324176&r2=324177
==============================================================================
--- trunk/apps/app_meetme.c (original)
+++ trunk/apps/app_meetme.c Fri Jun 17 13:39:26 2011
@@ -371,7 +371,7 @@
 		</syntax>
 		<description>
 			<para>Run admin <replaceable>command</replaceable> for a specific
-			<replaceable>channel</replaceable> in any coference.</para>
+			<replaceable>channel</replaceable> in any conference.</para>
 		</description>
 	</application>
 	<application name="SLAStation" language="en_US">