Rainer Gerhards 0871d0a077 Merge branch 'v4-stable' into v5-stable ...

Conflicts:
	plugins/imfile/imfile.c
	plugins/omtesting/omtesting.c
	tcpsrv.c
	threads.c

2012-01-14 18:32:40 +01:00

..

Makefile.am

make all cflags and libs variables uppercase

2009-02-24 13:09:44 +01:00

ommail.c

Merge branch 'v4-stable' into v5-stable

2012-01-14 18:32:40 +01:00