Merge pull request #50 in FS/freeswitch from ~JMESQUITA/freeswitch:mod_say_es_AR...

author Mike Jerris <mike@jerris.com>

Thu, 6 Nov 2014 23:21:08 +0000 (17:21 -0600)

committer Mike Jerris <mike@jerris.com>

Thu, 6 Nov 2014 23:21:08 +0000 (17:21 -0600)
author Mike Jerris <mike@jerris.com>
Thu, 6 Nov 2014 23:21:08 +0000 (17:21 -0600)
committer Mike Jerris <mike@jerris.com>
Thu, 6 Nov 2014 23:21:08 +0000 (17:21 -0600)
diff --cc build/modules.conf.in
Simple merge
diff --cc configure.ac
Simple merge
author	Mike Jerris <mike@jerris.com>
	Thu, 6 Nov 2014 23:21:08 +0000 (17:21 -0600)
committer	Mike Jerris <mike@jerris.com>
	Thu, 6 Nov 2014 23:21:08 +0000 (17:21 -0600)
		1	2
build/modules.conf.in	patch \|	diff1 \|	diff2 \|	blob \| history
configure.ac	patch \|	diff1 \|	diff2 \|	blob \| history