Merge branch 'master' of ssh://git.freeswitch.org:222/freeswitch-contrib

9aa5eda9 · Mitch Capper · ebd314b5 · 114ab80c · 9aa5eda9 · 9aa5eda9
--- a/intralanman/PHP/phttapi/phttapi.php
+++ b/intralanman/PHP/phttapi/phttapi.php
--- a/mcollins/fs12book/AppendixA/1004_15.docx
+++ b/mcollins/fs12book/AppendixA/1004_15.docx
--- a/mcollins/fs12book/AppendixB/1004_16.docx
+++ b/mcollins/fs12book/AppendixB/1004_16.docx
--- a/mcollins/fs12book/AppendixC/1004_17.docx
+++ b/mcollins/fs12book/AppendixC/1004_17.docx
--- a/mcollins/fs12book/Author Bundle.rar
+++ b/mcollins/fs12book/Author Bundle.rar
--- a/mcollins/fs12book/Ch1.zip
+++ b/mcollins/fs12book/Ch1.zip
--- a/mcollins/fs12book/Ch1/FS12book_Chapter1.docx
+++ b/mcollins/fs12book/Ch1/FS12book_Chapter1.docx
--- a/mcollins/fs12book/Ch1/xxxx_01_01.png
+++ b/mcollins/fs12book/Ch1/xxxx_01_01.png
--- a/mcollins/fs12book/Ch10/1004_10.docx
+++ b/mcollins/fs12book/Ch10/1004_10.docx
--- a/mcollins/fs12book/Ch11/1004_11.docx
+++ b/mcollins/fs12book/Ch11/1004_11.docx
--- a/mcollins/fs12book/Ch12/1004_12.docx
+++ b/mcollins/fs12book/Ch12/1004_12.docx
--- a/mcollins/fs12book/Ch13/1004_13.docx
+++ b/mcollins/fs12book/Ch13/1004_13.docx
--- a/mcollins/fs12book/Ch14/1004_14.docx
+++ b/mcollins/fs12book/Ch14/1004_14.docx
--- a/mcollins/fs12book/Ch2.zip
+++ b/mcollins/fs12book/Ch2.zip
--- a/mcollins/fs12book/Ch2/1004_02.docx
+++ b/mcollins/fs12book/Ch2/1004_02.docx
--- a/mcollins/fs12book/Ch2/1004_02_01.png
+++ b/mcollins/fs12book/Ch2/1004_02_01.png
--- a/mcollins/fs12book/Ch2/1004_02_02.png
+++ b/mcollins/fs12book/Ch2/1004_02_02.png
--- a/mcollins/fs12book/Ch2/1004_02_03.png
+++ b/mcollins/fs12book/Ch2/1004_02_03.png
--- a/mcollins/fs12book/Ch2/1004_02_04.png
+++ b/mcollins/fs12book/Ch2/1004_02_04.png
--- a/mcollins/fs12book/Ch2/1004_02_05.png
+++ b/mcollins/fs12book/Ch2/1004_02_05.png
--- a/mcollins/fs12book/Ch3/1004_03.docx
+++ b/mcollins/fs12book/Ch3/1004_03.docx
--- a/mcollins/fs12book/Ch3/106_11pt_Packt_Template_ForAuthors.dot
+++ b/mcollins/fs12book/Ch3/106_11pt_Packt_Template_ForAuthors.dot
--- a/mcollins/fs12book/Ch4/1004_04.docx
+++ b/mcollins/fs12book/Ch4/1004_04.docx
--- a/mcollins/fs12book/Ch5/1004_05.docx
+++ b/mcollins/fs12book/Ch5/1004_05.docx
--- a/mcollins/fs12book/Ch6/1004_06.docx
+++ b/mcollins/fs12book/Ch6/1004_06.docx
--- a/mcollins/fs12book/Ch7/1004_07.docx
+++ b/mcollins/fs12book/Ch7/1004_07.docx
--- a/mcollins/fs12book/Ch8/1004_08.docx
+++ b/mcollins/fs12book/Ch8/1004_08.docx
--- a/mcollins/fs12book/Ch9/1004_09.docx
+++ b/mcollins/fs12book/Ch9/1004_09.docx
--- a/mcollins/fs12book/New Author Bundle/095_ImportantNoteForAuthors.doc
+++ b/mcollins/fs12book/New Author Bundle/095_ImportantNoteForAuthors.doc
--- a/mcollins/fs12book/New Author Bundle/106_11pt_Packt_Template_ForAuthors.dot
+++ b/mcollins/fs12book/New Author Bundle/106_11pt_Packt_Template_ForAuthors.dot
--- a/mcollins/fs12book/New Author Bundle/106_PacktTemplate_Styles_List.doc
+++ b/mcollins/fs12book/New Author Bundle/106_PacktTemplate_Styles_List.doc
--- a/mcollins/fs12book/New Author Bundle/108_AuthorGuidelines_10.doc
+++ b/mcollins/fs12book/New Author Bundle/108_AuthorGuidelines_10.doc
--- a/mcollins/fs12book/New Author Bundle/EditorialProcess.pdf
+++ b/mcollins/fs12book/New Author Bundle/EditorialProcess.pdf
--- a/mcollins/fs12book/The PACKT Template.docx
+++ b/mcollins/fs12book/The PACKT Template.docx