Conflicts:
	build/buildopal.sh
	conf/vanilla/autoload_configs/opal.conf.xml
	configure.in
	libs/freetdm/mod_freetdm/mod_freetdm.c
	libs/freetdm/src/ftmod/ftmod_libpri/ftmod_libpri.h
	libs/freetdm/src/ftmod/ftmod_misdn/ftmod_misdn.c
	libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn.h
	libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_cfg.c
	libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_cntrl.c
	libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_stack_cfg.c
	libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_stack_out.c
	libs/spandsp/configure.ac
	libs/spandsp/src/libtiff.2008.vcproj
	libs/spandsp/src/spandsp/private/t4_tx.h
	libs/tiff-4.0.2/Makefile.am
	libs/tiff-4.0.2/Makefile.vc
	libs/tiff-4.0.2/README
	libs/tiff-4.0.2/SConstruct
	libs/tiff-4.0.2/TODO
	libs/tiff-4.0.2/autogen.sh
	libs/tiff-4.0.2/contrib/Makefile.am
	libs/tiff-4.0.2/contrib/addtiffo/addtiffo.c
	libs/tiff-4.0.2/contrib/addtiffo/tif_overview.c
	libs/tiff-4.0.2/contrib/addtiffo/tif_ovrcache.c
	libs/tiff-4.0.2/contrib/addtiffo/tif_ovrcache.h
	libs/tiff-4.0.2/contrib/dbs/tiff-bi.c
	libs/tiff-4.0.2/contrib/dbs/tiff-grayscale.c
	libs/tiff-4.0.2/contrib/dbs/tiff-palette.c
	libs/tiff-4.0.2/contrib/dbs/tiff-rgb.c
	libs/tiff-4.0.2/contrib/dbs/xtiff/Makefile.am
	libs/tiff-4.0.2/contrib/dbs/xtiff/xtiff.c
	libs/tiff-4.0.2/contrib/dbs/xtiff/xtifficon.h
	libs/tiff-4.0.2/contrib/iptcutil/iptcutil.c
	libs/tiff-4.0.2/contrib/mfs/mfs_file.c
	libs/tiff-4.0.2/contrib/pds/tif_imageiter.c
	libs/tiff-4.0.2/contrib/pds/tif_imageiter.h
	libs/tiff-4.0.2/contrib/pds/tif_pdsdirread.c
	libs/tiff-4.0.2/contrib/pds/tif_pdsdirwrite.c
	libs/tiff-4.0.2/contrib/ras/ras2tif.c
	libs/tiff-4.0.2/contrib/ras/tif2ras.c
	libs/tiff-4.0.2/contrib/stream/tiffstream.cpp
	libs/tiff-4.0.2/contrib/stream/tiffstream.h
	libs/tiff-4.0.2/contrib/tags/listtif.c
	libs/tiff-4.0.2/contrib/tags/maketif.c
	libs/tiff-4.0.2/contrib/tags/xtif_dir.c
	libs/tiff-4.0.2/contrib/tags/xtiffio.h
	libs/tiff-4.0.2/contrib/tags/xtiffiop.h
	libs/tiff-4.0.2/contrib/win_dib/Tiffile.cpp
	libs/tiff-4.0.2/contrib/win_dib/tiff2dib.c
	libs/tiff-4.0.2/html/Makefile.am
	libs/tiff-4.0.2/html/addingtags.html
	libs/tiff-4.0.2/html/bugs.html
	libs/tiff-4.0.2/html/contrib.html
	libs/tiff-4.0.2/html/document.html
	libs/tiff-4.0.2/html/images.html
	libs/tiff-4.0.2/html/index.html
	libs/tiff-4.0.2/html/internals.html
	libs/tiff-4.0.2/html/intro.html
	libs/tiff-4.0.2/html/libtiff.html
	libs/tiff-4.0.2/html/man/Makefile.am
	libs/tiff-4.0.2/html/man/TIFFClose.3tiff.html
	libs/tiff-4.0.2/html/man/TIFFDataWidth.3tiff.html
	libs/tiff-4.0.2/html/man/TIFFError.3tiff.html
	libs/tiff-4.0.2/html/man/TIFFFlush.3tiff.html
	libs/tiff-4.0.2/html/man/TIFFOpen.3tiff.html
	libs/tiff-4.0.2/html/man/TIFFPrintDirectory.3tiff.html
	libs/tiff-4.0.2/html/man/TIFFRGBAImage.3tiff.html
	libs/tiff-4.0.2/html/man/TIFFReadDirectory.3tiff.html
	libs/tiff-4.0.2/html/man/TIFFReadEncodedStrip.3tiff.html
	libs/tiff-4.0.2/html/man/TIFFReadEncodedTile.3tiff.html
	libs/tiff-4.0.2/html/man/TIFFReadRGBAImage.3tiff.html
	libs/tiff-4.0.2/html/man/TIFFReadRGBAStrip.3tiff.html
	libs/tiff-4.0.2/html/man/TIFFReadRGBATile.3tiff.html
	libs/tiff-4.0.2/html/man/TIFFReadRawStrip.3tiff.html
	libs/tiff-4.0.2/html/man/TIFFReadRawTile.3tiff.html
	libs/tiff-4.0.2/html/man/TIFFReadScanline.3tiff.html
	libs/tiff-4.0.2/html/man/TIFFReadTile.3tiff.html
	libs/tiff-4.0.2/html/man/TIFFSetDirectory.3tiff.html
	libs/tiff-4.0.2/html/man/TIFFWarning.3tiff.html
	libs/tiff-4.0.2/html/man/TIFFWriteDirectory.3tiff.html
	libs/tiff-4.0.2/html/man/TIFFWriteEncodedStrip.3tiff.html
	libs/tiff-4.0.2/html/man/TIFFWriteEncodedTile.3tiff.html
	libs/tiff-4.0.2/html/man/TIFFWriteRawStrip.3tiff.html
	libs/tiff-4.0.2/html/man/TIFFWriteRawTile.3tiff.html
	libs/tiff-4.0.2/html/man/TIFFWriteScanline.3tiff.html
	libs/tiff-4.0.2/html/man/TIFFWriteTile.3tiff.html
	libs/tiff-4.0.2/html/man/TIFFbuffer.3tiff.html
	libs/tiff-4.0.2/html/man/TIFFcodec.3tiff.html
	libs/tiff-4.0.2/html/man/TIFFcolor.3tiff.html
	libs/tiff-4.0.2/html/man/TIFFmemory.3tiff.html
	libs/tiff-4.0.2/html/man/TIFFquery.3tiff.html
	libs/tiff-4.0.2/html/man/TIFFsize.3tiff.html
	libs/tiff-4.0.2/html/man/TIFFstrip.3tiff.html
	libs/tiff-4.0.2/html/man/TIFFswab.3tiff.html
	libs/tiff-4.0.2/html/man/TIFFtile.3tiff.html
	libs/tiff-4.0.2/html/man/fax2ps.1.html
	libs/tiff-4.0.2/html/man/fax2tiff.1.html
	libs/tiff-4.0.2/html/man/gif2tiff.1.html
	libs/tiff-4.0.2/html/man/index.html
	libs/tiff-4.0.2/html/man/pal2rgb.1.html
	libs/tiff-4.0.2/html/man/ppm2tiff.1.html
	libs/tiff-4.0.2/html/man/ras2tiff.1.html
	libs/tiff-4.0.2/html/man/raw2tiff.1.html
	libs/tiff-4.0.2/html/man/rgb2ycbcr.1.html
	libs/tiff-4.0.2/html/man/sgi2tiff.1.html
	libs/tiff-4.0.2/html/man/thumbnail.1.html
	libs/tiff-4.0.2/html/man/tiff2bw.1.html
	libs/tiff-4.0.2/html/man/tiff2pdf.1.html
	libs/tiff-4.0.2/html/man/tiff2ps.1.html
	libs/tiff-4.0.2/html/man/tiff2rgba.1.html
	libs/tiff-4.0.2/html/man/tiffcmp.1.html
	libs/tiff-4.0.2/html/man/tiffcrop.1.html
	libs/tiff-4.0.2/html/man/tiffdither.1.html
	libs/tiff-4.0.2/html/man/tiffdump.1.html
	libs/tiff-4.0.2/html/man/tiffgt.1.html
	libs/tiff-4.0.2/html/man/tiffinfo.1.html
	libs/tiff-4.0.2/html/man/tiffmedian.1.html
	libs/tiff-4.0.2/html/man/tiffset.1.html
	libs/tiff-4.0.2/html/man/tiffsplit.1.html
	libs/tiff-4.0.2/html/man/tiffsv.1.html
	libs/tiff-4.0.2/html/misc.html
	libs/tiff-4.0.2/html/support.html
	libs/tiff-4.0.2/html/tools.html
	libs/tiff-4.0.2/html/v3.4beta007.html
	libs/tiff-4.0.2/html/v3.4beta016.html
	libs/tiff-4.0.2/html/v3.4beta018.html
	libs/tiff-4.0.2/html/v3.4beta024.html
	libs/tiff-4.0.2/html/v3.4beta028.html
	libs/tiff-4.0.2/html/v3.4beta029.html
	libs/tiff-4.0.2/html/v3.4beta031.html
	libs/tiff-4.0.2/html/v3.4beta032.html
	libs/tiff-4.0.2/html/v3.4beta033.html
	libs/tiff-4.0.2/html/v3.4beta034.html
	libs/tiff-4.0.2/html/v3.4beta035.html
	libs/tiff-4.0.2/html/v3.4beta036.html
	libs/tiff-4.0.2/html/v3.5.1.html
	libs/tiff-4.0.2/html/v3.5.2.html
	libs/tiff-4.0.2/html/v3.5.3.html
	libs/tiff-4.0.2/html/v3.5.4.html
	libs/tiff-4.0.2/html/v3.5.5.html
	libs/tiff-4.0.2/html/v3.5.6-beta.html
	libs/tiff-4.0.2/html/v3.5.7.html
	libs/tiff-4.0.2/html/v3.6.0.html
	libs/tiff-4.0.2/html/v3.6.1.html
	libs/tiff-4.0.2/html/v3.7.0.html
	libs/tiff-4.0.2/html/v3.7.0alpha.html
	libs/tiff-4.0.2/html/v3.7.0beta.html
	libs/tiff-4.0.2/html/v3.7.1.html
	libs/tiff-4.0.2/html/v3.7.2.html
	libs/tiff-4.0.2/html/v3.7.3.html
	libs/tiff-4.0.2/html/v3.7.4.html
	libs/tiff-4.0.2/html/v3.8.0.html
	libs/tiff-4.0.2/html/v3.8.1.html
	libs/tiff-4.0.2/html/v3.8.2.html
	libs/tiff-4.0.2/html/v4.0.2.html
	libs/tiff-4.0.2/libtiff/Makefile.am
	libs/tiff-4.0.2/libtiff/Makefile.vc
	libs/tiff-4.0.2/libtiff/SConstruct
	libs/tiff-4.0.2/libtiff/libtiff.def
	libs/tiff-4.0.2/libtiff/mkg3states.c
	libs/tiff-4.0.2/libtiff/t4.h
	libs/tiff-4.0.2/libtiff/tif_aux.c
	libs/tiff-4.0.2/libtiff/tif_close.c
	libs/tiff-4.0.2/libtiff/tif_codec.c
	libs/tiff-4.0.2/libtiff/tif_color.c
	libs/tiff-4.0.2/libtiff/tif_compress.c
	libs/tiff-4.0.2/libtiff/tif_config.wince.h
	libs/tiff-4.0.2/libtiff/tif_dumpmode.c
	libs/tiff-4.0.2/libtiff/tif_error.c
	libs/tiff-4.0.2/libtiff/tif_extension.c
	libs/tiff-4.0.2/libtiff/tif_fax3.c
	libs/tiff-4.0.2/libtiff/tif_fax3.h
	libs/tiff-4.0.2/libtiff/tif_fax3sm.c
	libs/tiff-4.0.2/libtiff/tif_getimage.c
	libs/tiff-4.0.2/libtiff/tif_jpeg.c
	libs/tiff-4.0.2/libtiff/tif_luv.c
	libs/tiff-4.0.2/libtiff/tif_lzw.c
	libs/tiff-4.0.2/libtiff/tif_next.c
	libs/tiff-4.0.2/libtiff/tif_open.c
	libs/tiff-4.0.2/libtiff/tif_packbits.c
	libs/tiff-4.0.2/libtiff/tif_pixarlog.c
	libs/tiff-4.0.2/libtiff/tif_predict.c
	libs/tiff-4.0.2/libtiff/tif_predict.h
	libs/tiff-4.0.2/libtiff/tif_print.c
	libs/tiff-4.0.2/libtiff/tif_swab.c
	libs/tiff-4.0.2/libtiff/tif_thunder.c
	libs/tiff-4.0.2/libtiff/tif_tile.c
	libs/tiff-4.0.2/libtiff/tif_unix.c
	libs/tiff-4.0.2/libtiff/tif_warning.c
	libs/tiff-4.0.2/libtiff/tif_win32.c
	libs/tiff-4.0.2/libtiff/tif_write.c
	libs/tiff-4.0.2/libtiff/tif_zip.c
	libs/tiff-4.0.2/libtiff/tiff.h
	libs/tiff-4.0.2/libtiff/tiffconf.h.in
	libs/tiff-4.0.2/libtiff/tiffconf.wince.h
	libs/tiff-4.0.2/libtiff/tiffvers.h
	libs/tiff-4.0.2/libtiff/uvcode.h
	libs/tiff-4.0.2/man/Makefile.am
	libs/tiff-4.0.2/man/TIFFClose.3tiff
	libs/tiff-4.0.2/man/TIFFDataWidth.3tiff
	libs/tiff-4.0.2/man/TIFFError.3tiff
	libs/tiff-4.0.2/man/TIFFFlush.3tiff
	libs/tiff-4.0.2/man/TIFFGetField.3tiff
	libs/tiff-4.0.2/man/TIFFOpen.3tiff
	libs/tiff-4.0.2/man/TIFFPrintDirectory.3tiff
	libs/tiff-4.0.2/man/TIFFRGBAImage.3tiff
	libs/tiff-4.0.2/man/TIFFReadDirectory.3tiff
	libs/tiff-4.0.2/man/TIFFReadEncodedStrip.3tiff
	libs/tiff-4.0.2/man/TIFFReadEncodedTile.3tiff
	libs/tiff-4.0.2/man/TIFFReadRGBAImage.3tiff
	libs/tiff-4.0.2/man/TIFFReadRGBAStrip.3tiff
	libs/tiff-4.0.2/man/TIFFReadRGBATile.3tiff
	libs/tiff-4.0.2/man/TIFFReadRawStrip.3tiff
	libs/tiff-4.0.2/man/TIFFReadRawTile.3tiff
	libs/tiff-4.0.2/man/TIFFReadScanline.3tiff
	libs/tiff-4.0.2/man/TIFFReadTile.3tiff
	libs/tiff-4.0.2/man/TIFFSetDirectory.3tiff
	libs/tiff-4.0.2/man/TIFFSetField.3tiff
	libs/tiff-4.0.2/man/TIFFWarning.3tiff
	libs/tiff-4.0.2/man/TIFFWriteDirectory.3tiff
	libs/tiff-4.0.2/man/TIFFWriteEncodedStrip.3tiff
	libs/tiff-4.0.2/man/TIFFWriteEncodedTile.3tiff
	libs/tiff-4.0.2/man/TIFFWriteRawStrip.3tiff
	libs/tiff-4.0.2/man/TIFFWriteRawTile.3tiff
	libs/tiff-4.0.2/man/TIFFWriteScanline.3tiff
	libs/tiff-4.0.2/man/TIFFWriteTile.3tiff
	libs/tiff-4.0.2/man/TIFFbuffer.3tiff
	libs/tiff-4.0.2/man/TIFFcodec.3tiff
	libs/tiff-4.0.2/man/TIFFcolor.3tiff
	libs/tiff-4.0.2/man/TIFFmemory.3tiff
	libs/tiff-4.0.2/man/TIFFquery.3tiff
	libs/tiff-4.0.2/man/TIFFsize.3tiff
	libs/tiff-4.0.2/man/TIFFstrip.3tiff
	libs/tiff-4.0.2/man/TIFFswab.3tiff
	libs/tiff-4.0.2/man/TIFFtile.3tiff
	libs/tiff-4.0.2/man/bmp2tiff.1
	libs/tiff-4.0.2/man/fax2ps.1
	libs/tiff-4.0.2/man/fax2tiff.1
	libs/tiff-4.0.2/man/gif2tiff.1
	libs/tiff-4.0.2/man/libtiff.3tiff
	libs/tiff-4.0.2/man/pal2rgb.1
	libs/tiff-4.0.2/man/ppm2tiff.1
	libs/tiff-4.0.2/man/ras2tiff.1
	libs/tiff-4.0.2/man/raw2tiff.1
	libs/tiff-4.0.2/man/rgb2ycbcr.1
	libs/tiff-4.0.2/man/sgi2tiff.1
	libs/tiff-4.0.2/man/thumbnail.1
	libs/tiff-4.0.2/man/tiff2bw.1
	libs/tiff-4.0.2/man/tiff2pdf.1
	libs/tiff-4.0.2/man/tiff2ps.1
	libs/tiff-4.0.2/man/tiff2rgba.1
	libs/tiff-4.0.2/man/tiffcmp.1
	libs/tiff-4.0.2/man/tiffcp.1
	libs/tiff-4.0.2/man/tiffdither.1
	libs/tiff-4.0.2/man/tiffdump.1
	libs/tiff-4.0.2/man/tiffgt.1
	libs/tiff-4.0.2/man/tiffinfo.1
	libs/tiff-4.0.2/man/tiffmedian.1
	libs/tiff-4.0.2/man/tiffset.1
	libs/tiff-4.0.2/man/tiffsplit.1
	libs/tiff-4.0.2/man/tiffsv.1
	libs/tiff-4.0.2/nmake.opt
	libs/tiff-4.0.2/port/Makefile.am
	libs/tiff-4.0.2/port/Makefile.vc
	libs/tiff-4.0.2/port/dummy.c
	libs/tiff-4.0.2/port/getopt.c
	libs/tiff-4.0.2/port/lfind.c
	libs/tiff-4.0.2/port/libport.h
	libs/tiff-4.0.2/port/strcasecmp.c
	libs/tiff-4.0.2/port/strtoull.c
	libs/tiff-4.0.2/test/ascii_tag.c
	libs/tiff-4.0.2/test/check_tag.c
	libs/tiff-4.0.2/test/long_tag.c
	libs/tiff-4.0.2/test/short_tag.c
	libs/tiff-4.0.2/test/strip.c
	libs/tiff-4.0.2/test/strip_rw.c
	libs/tiff-4.0.2/test/test_arrays.c
	libs/tiff-4.0.2/test/test_arrays.h
	libs/tiff-4.0.2/test/tifftest.h
	libs/tiff-4.0.2/tools/Makefile.am
	libs/tiff-4.0.2/tools/Makefile.vc
	libs/tiff-4.0.2/tools/bmp2tiff.c
	libs/tiff-4.0.2/tools/fax2ps.c
	libs/tiff-4.0.2/tools/fax2tiff.c
	libs/tiff-4.0.2/tools/gif2tiff.c
	libs/tiff-4.0.2/tools/pal2rgb.c
	libs/tiff-4.0.2/tools/ppm2tiff.c
	libs/tiff-4.0.2/tools/ras2tiff.c
	libs/tiff-4.0.2/tools/rasterfile.h
	libs/tiff-4.0.2/tools/raw2tiff.c
	libs/tiff-4.0.2/tools/rgb2ycbcr.c
	libs/tiff-4.0.2/tools/sgi2tiff.c
	libs/tiff-4.0.2/tools/sgisv.c
	libs/tiff-4.0.2/tools/thumbnail.c
	libs/tiff-4.0.2/tools/tiff2bw.c
	libs/tiff-4.0.2/tools/tiff2pdf.c
	libs/tiff-4.0.2/tools/tiff2rgba.c
	libs/tiff-4.0.2/tools/tiffcmp.c
	libs/tiff-4.0.2/tools/tiffcp.c
	libs/tiff-4.0.2/tools/tiffdither.c
	libs/tiff-4.0.2/tools/tiffdump.c
	libs/tiff-4.0.2/tools/tiffgt.c
	libs/tiff-4.0.2/tools/tiffinfo.c
	libs/tiff-4.0.2/tools/tiffmedian.c
	libs/tiff-4.0.2/tools/tiffset.c
	libs/tiff-4.0.2/tools/tiffsplit.c
	libs/tiff-4.0.2/tools/ycbcr.c
	libs/win32/libjpeg/libjpeg.2008.vcproj
	libs/win32/libjpeg/libjpeg.2010.vcxproj
	src/mod/applications/mod_spandsp/mod_spandsp_fax.c
	src/mod/endpoints/mod_opal/mod_opal.cpp
	src/mod/endpoints/mod_opal/mod_opal.h
	src/mod/endpoints/mod_sofia/mod_sofia.h
	src/mod/endpoints/mod_sofia/rtp.c
	src/mod/endpoints/mod_sofia/sofia.c
	src/mod/endpoints/mod_sofia/sofia_presence.c
	src/mod/languages/mod_managed/freeswitch_wrap.2010.cxx
	src/mod/languages/mod_managed/managed/swig.2010.cs
	src/mod/xml_int/mod_xml_radius/mod_xml_radius.c
	src/switch_ivr_originate.c
	w32/Library/FreeSwitchCore.2008.vcproj
	w32/Library/FreeSwitchCore.2010.vcxproj

Small tweak for media I/O in proxy mode, don't silence frame just because no codec. Needed for H.323 fax.

Added tracing for error conditions in mod_spandsp

Fixed correct media "frames/packet" for G.711, default to 20ms worth.

FS-4614 --resolve update to dynamic line buffer and use internal buffering to boot for file I/O on preprocessing XML

Also add a few more PH_CONTROL_IND message types.
Signed-off-by: Stefan Knoblich <stkn@openisdn.net>

Silences the "Device or resource busy" error messages caused by the RX pipe
filling up.
Signed-off-by: Stefan Knoblich <stkn@openisdn.net>

Signed-off-by: Stefan Knoblich <stkn@openisdn.net>

SWITCH_DEFAULT_CLID_NUMBER and replace all occurrences
in the FreeSWITCH codebase.
Signed-off-by: Stefan Knoblich <stkn@openisdn.net>

FS-4099 --resolve switch windows to use posix delimiter (/) for base paths. This will correct numerous problems with escaped chars. This change only effects windows builds. Please test.

Some people, it seems, were having sleepless nights from the
log messages this feature produces every 15 minutes.

Default disable the feature, because i hate repeating myself
over and over, explaining them this is a non-issue and intended
behaviour and how to disable it in the config.
Signed-off-by: Stefan Knoblich <stkn@openisdn.net>