asterisk-xmpp merge in

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@29553 65c4cc65-6c06-0410-ace0-fbb531ad65f3

1 files changed, 19 insertions, 0 deletions

diff --git a/configs/jingle.conf.sample b/configs/jingle.conf.sample
new file mode 100644
index 000000000..da629b626
--- /dev/null
+++ b/configs/jingle.conf.sample
@@ -0,0 +1,19 @@
+;[general]
+;context=default		;;Context to dump call into
+;allowguest=yes			;;Allow calls from people not in
+				;;list of peers
+;
+;[guest]			;;special account for options on guest account
+;disallow=all				
+;allow=ulaw
+;context=guest
+;
+;[ogorman]
+;username=ogorman@gmail.com	;;username of the peer your 
+				;;calling or accepting calls from
+;disallow=all
+;allow=ulaw
+;context=default		
+;connection=asterisk		;;client or component in jabber.conf
+				;;for the call to leave on.
+;