From: Ken Rice <krice@freeswitch.org>
Date: Wed, 17 Sep 2014 17:23:14 +0000 (-0500)
Subject: Merge branch 'master' into v1.4
X-Git-Tag: v1.4.8~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=55d0aec559172470d92cd677fce66f68b9173e27;p=thirdparty%2Ffreeswitch.git

Merge branch 'master' into v1.4

Conflicts:
	freeswitch.spec
---

55d0aec559172470d92cd677fce66f68b9173e27
diff --cc freeswitch.spec
index bcf15a8b92,0f8145efa5..c993acf00c
--- a/freeswitch.spec
+++ b/freeswitch.spec
@@@ -2339,9 -2371,9 +2371,11 @@@ f
  #
  ######################################################################################################################
  %changelog
+ * 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
- * Fri Jun 02 2014 - krice@freeswitch.org
+ * 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