Merge branch 'master' of ssh://git.freeswitch.org:222/freeswitch

author Chris Rienzo <chris.rienzo@grasshopper.com>

Mon, 13 Jan 2014 16:02:35 +0000 (11:02 -0500)

committer Chris Rienzo <chris.rienzo@grasshopper.com>

Mon, 13 Jan 2014 16:02:35 +0000 (11:02 -0500)
author Chris Rienzo <chris.rienzo@grasshopper.com>
Mon, 13 Jan 2014 16:02:35 +0000 (11:02 -0500)
committer Chris Rienzo <chris.rienzo@grasshopper.com>
Mon, 13 Jan 2014 16:02:35 +0000 (11:02 -0500)
diff --cc src/mod/event_handlers/mod_rayo/rayo_output_component.c
Simple merge
author	Chris Rienzo <chris.rienzo@grasshopper.com>
	Mon, 13 Jan 2014 16:02:35 +0000 (11:02 -0500)
committer	Chris Rienzo <chris.rienzo@grasshopper.com>
	Mon, 13 Jan 2014 16:02:35 +0000 (11:02 -0500)