[svn-commits] mmichelson: branch group/issue8824 r182967 - in /team/group/issue8824: ./ main/

[SVN commits to the Digium repositories]

Author: mmichelson
Date: Wed Mar 18 15:07:57 2009
New Revision: 182967

URL: http://svn.digium.com/svn-view/asterisk?view=rev&rev=182967
Log:
Get in sync with trunk


Modified:
    team/group/issue8824/   (props changed)
    team/group/issue8824/main/asterisk.exports

Propchange: team/group/issue8824/
------------------------------------------------------------------------------
Binary property 'branch-1.4-blocked' - no diff available.

Propchange: team/group/issue8824/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Wed Mar 18 15:07:57 2009
@@ -1,1 +1,1 @@
-/trunk:1-182895
+/trunk:1-182966

Modified: team/group/issue8824/main/asterisk.exports
URL: http://svn.digium.com/svn-view/asterisk/team/group/issue8824/main/asterisk.exports?view=diff&rev=182967&r1=182966&r2=182967
==============================================================================
--- team/group/issue8824/main/asterisk.exports (original)
+++ team/group/issue8824/main/asterisk.exports Wed Mar 18 15:07:57 2009
@@ -21,7 +21,7 @@
 		jb_*;
 		channelreloadreason2txt;
 		devstate2str;
-		manager_event;
+		__manager_event;
 		dialed_interface_info;
 	local:
 		*;