From: Ken Rice <krice@freeswitch.org>
Date: Thu, 12 Mar 2015 18:51:12 +0000 (-0500)
Subject: Merge branch 'master' into v1.4
X-Git-Tag: v1.4.17~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5a650e4c2f5b7e7888f3bb22509d2af2d57a9bc0;p=thirdparty%2Ffreeswitch.git

Merge branch 'master' into v1.4

Conflicts:
	build/next-release.txt
---

5a650e4c2f5b7e7888f3bb22509d2af2d57a9bc0
diff --cc build/next-release.txt
index 6ee81aba98,0ed0610841..04e0d3f14f
--- a/build/next-release.txt
+++ b/build/next-release.txt
@@@ -1,1 -1,1 +1,1 @@@
- 1.4.16
 -1.5.16
++1.4.17