Merge remote branch 'qa-master/releases.3.4' into releases.3.4

author Nenad Corbic <ncorbic@sangoma.com>

Sat, 29 Oct 2011 04:08:47 +0000 (00:08 -0400)

committer Nenad Corbic <ncorbic@sangoma.com>

Sat, 29 Oct 2011 04:08:47 +0000 (00:08 -0400)
author Nenad Corbic <ncorbic@sangoma.com>
Sat, 29 Oct 2011 04:08:47 +0000 (00:08 -0400)
committer Nenad Corbic <ncorbic@sangoma.com>
Sat, 29 Oct 2011 04:08:47 +0000 (00:08 -0400)
diff --cc libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_xml.c
Simple merge
author	Nenad Corbic <ncorbic@sangoma.com>
	Sat, 29 Oct 2011 04:08:47 +0000 (00:08 -0400)
committer	Nenad Corbic <ncorbic@sangoma.com>
	Sat, 29 Oct 2011 04:08:47 +0000 (00:08 -0400)