Merge branch 'master' into SpamServ
authorNurPech <nurpech@nurpech.de>
Mon, 20 May 2013 20:44:29 +0000 (22:44 +0200)
committerNurPech <nurpech@nurpech.de>
Mon, 20 May 2013 20:44:29 +0000 (22:44 +0200)
commitfb221603563fc29c37c6f2792928f6cfe60f8dc7
treeac9e86f09449fb04be483bfa966ab685e41063d9
parent40a9a37aae08e85eae5d9a5af6c1c1f99775af32
parentc7c06b7fb90b2596050dbb60d3c8d567bbf49239
Merge branch 'master' into SpamServ

Conflicts:
src/spamserv.c
src/spamserv.c