Merge pull request #417 in FS/freeswitch from ~JONATASOLIVEIRA/freeswitch:FS-8022...

author Ítalo Rossi <italorossib@gmail.com>

Fri, 21 Aug 2015 17:41:25 +0000 (12:41 -0500)

committer Ítalo Rossi <italorossib@gmail.com>

Fri, 21 Aug 2015 17:41:25 +0000 (12:41 -0500)
author Ítalo Rossi <italorossib@gmail.com>
Fri, 21 Aug 2015 17:41:25 +0000 (12:41 -0500)
committer Ítalo Rossi <italorossib@gmail.com>
Fri, 21 Aug 2015 17:41:25 +0000 (12:41 -0500)
diff --cc html5/verto/verto_communicator/js/controllers.js
Simple merge
diff --cc html5/verto/verto_communicator/js/verto-service.js
Simple merge
author	Ítalo Rossi <italorossib@gmail.com>
	Fri, 21 Aug 2015 17:41:25 +0000 (12:41 -0500)
committer	Ítalo Rossi <italorossib@gmail.com>
	Fri, 21 Aug 2015 17:41:25 +0000 (12:41 -0500)
		1	2
html5/verto/verto_communicator/js/controllers.js	patch \|	diff1 \|	diff2 \|	blob \| history
html5/verto/verto_communicator/js/verto-service.js	patch \|	diff1 \|	diff2 \|	blob \| history