Ken Rice 9b341fd8fd Merge branch 'master' into v1.2.stable
Conflicts:
	libs/freetdm/src/ftmod/ftmod_zt/ftmod_zt.c
2013-02-26 09:43:43 -06:00
..
2007-10-19 02:46:05 +00:00