Merge branch 'master' into v1.4

Conflicts:
	freeswitch.spec

diff --cc configure.ac
Simple merge

diff --cc freeswitch.spec
index bcf15a8b921a76ed1e43640b81ef524ce720203c,0f8145efa580a5193b8c3e66115b4c809901663a..c993acf00c30509a9b3cdf2e0366ce789b7f51f5
--- 1/freeswitch.spec
--- 2/freeswitch.spec
+++ b/freeswitch.spec
@@@ -2339,9 -2371,9 +2371,11 @@@ f
  #
  ######################################################################################################################
  %changelog
- * Fri Jun 02 2014 - krice@freeswitch.org
+ * Thu Sep 11 2014 - krice@freeswitch.org
+ - add and fix mod_verto and mod_rtc
 +* Fri Jul 20 2014 - krice@freeswitch.org
 +- remove mod_cdr_pg_csv as its broken on centos
+ * Mon Jun 02 2014 - krice@freeswitch.org
  - remove mod_spidermoney as its been deprecated
  * Fri Feb 21 2014 - crienzo@grasshopper.com
  - change file owner to root