FS-4722: --resolve Thanks and test this, bitte. :)
Merge branch 'v1.2.stable' of ssh://git.freeswitch.org:222/freeswitch into v1.2.stable
Merge branch 'v1.2.stable' of ssh://git.freeswitch.org:222/freeswitch into v1.2.stable
Merge branch 'v1.2.stable' of ssh://git.freeswitch.org:222/freeswitch into v1.2.stable
Merge branch 'v1.2.stable' of ssh://git.freeswitch.org:222/freeswitch into v1.2.stable
fix merge conflicts
bump rev
Revert "bump rev"

This reverts commit a4247651ca6808b18d57167e5a7aa799a231966d.
Merge branch 'master' into v1.2.stable

Conflicts:
	libs/freetdm/src/ftmod/ftmod_zt/ftmod_zt.c
Merge branch 'master' into v1.2.stable

Conflicts:
	configure.in
Merge branch 'master' into v1.2.stable
Merge branch 'master' into v1.2.stable
Merge branch 'master' into v1.2.stable
Merge branch 'master' into v1.2.stable
bump rev we are almost there
release FreeSWITCH 1.2.6
Merge branch 'master' into v1.2.stable

Conflicts:
	configure.in
release FreeSWITCH 1.2.7
Merge branch 'master' into v1.2.stable

Conflicts:
	configure.in
Merge branch 'master' into v1.2.stable