Conflicts:
	libs/freetdm/src/ftmod/ftmod_r2/ftmod_r2.c

         export ftdm_current_time_in_ms to users
	 update testr2 to test non-blocking API (no waiting on indications)

use switch_zmalloc() instead of apr pools for short term storage, rename a couple of funcs to be clearer as to their purpose

added  -lgpg-error to sun compiler CXXFLAGS for iksemel library and tools to be build corretly in libiksemel configure.ac

added sqlite cdr module to modules.conf.in (built by default)

mod_cdr_pg_csv now spools the attempted SQL to disk if DB insert fails, instead of writing CSV. This should make it simpler to import any failed inserts.

freetdm: - updated all signaling modules (except for ftmod_isdn and ftmod_sangoma_ss7) to adapt to new core state processing
         - fixed bug in configure.ac to detect ftmod_pritap compilation
         - ignore FTDM_SIGEVENT_RELEASED and FTDM_SIGEVENT_INDICATION_COMPLETED in mod_freetdm
         - Destroy the state completed interrupt on channel destroy
         - Fix analog polarity reversal bug when using 3-way calling or call-swap

don't let inherit_codec work when we have ep_codec_string set and the B-leg codec is not in that list since it will lead to failure

         - Added locking documentation (docs/locking.txt)
	 - Updated core state advance to use state processor in span
           rather than pushing the processor in the function arguments

Drop transaction BEGIN/END around INSERT. We're only executing one command, and autocommit will automatically rollback if the INSERT fails.
Sync state_handlers with mod_cdr_csv. Minor libpq fixups.