Merge branch 'master' into v1.4

author Ken Rice <krice@freeswitch.org>

Thu, 12 Mar 2015 18:51:12 +0000 (13:51 -0500)

committer Ken Rice <krice@freeswitch.org>

Thu, 12 Mar 2015 18:51:12 +0000 (13:51 -0500)
author Ken Rice <krice@freeswitch.org>
Thu, 12 Mar 2015 18:51:12 +0000 (13:51 -0500)
committer Ken Rice <krice@freeswitch.org>
Thu, 12 Mar 2015 18:51:12 +0000 (13:51 -0500)
diff --cc build/next-release.txt

index 6ee81aba98faeae6d6847913839d263875f25fad,0ed06108419704708d77e62935b39abebaa379ca..04e0d3f14fd0062b5a98173a575b35e2206ccc61
--- 1/build/next-release.txt
--- 2/build/next-release.txt
+++ b/build/next-release.txt
@@@ -1,1 -1,1 +1,1 @@@
- 1.4.16
- -1.5.16
++1.4.17
diff --cc configure.ac
Simple merge
diff --cc freeswitch.spec
Simple merge
author	Ken Rice <krice@freeswitch.org>
	Thu, 12 Mar 2015 18:51:12 +0000 (13:51 -0500)
committer	Ken Rice <krice@freeswitch.org>
	Thu, 12 Mar 2015 18:51:12 +0000 (13:51 -0500)
		1	2
build/next-release.txt	patch \|	diff1 \|	diff2 \|	blob \| history
configure.ac	patch \|	diff1 \|	diff2 \|	blob \| history
freeswitch.spec	patch \|	diff1 \|	diff2 \|	blob \| history