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)

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

         - 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

	 use new core state processing functions in ftmod_r2

Conflicts:

	libs/freetdm/src/ftmod/ftmod_zt/ftmod_zt.c

                opened, not it prints a warning and proceeds to close it.
         ftmod_r2 - added handler for FTDM_CHANNEL_STATE_RESET state

freetdm: ftmod_zt - refactored zt_channel_next_event(), zt_next_event() and created zt_channel_process_event()

freetdm: ftmod_wanpipe - not locking the channel on wanpipe_channel_next_event(), now the core takes care of that

Conflicts:

	libs/freetdm/src/ftdm_io.c

                         and created wanpipe_channel_process_event(), used by both

freetdm: ftmod_r2 - use openr2 API extension to properly report incoming restricted ANI and restrict ANI on outgoing calls

freetdm: ftmod_r2 - refactored ftdm_span_next_event(), ftdm_channel_read_event() and created ftdm_event_handle_oob(),
                    which handle oob events and notify the user by sending the proper SIGEVENT message