fixed merging fails
authorNurPech <nurpech@nurpech.de>
Mon, 20 May 2013 21:01:46 +0000 (23:01 +0200)
committerNurPech <nurpech@nurpech.de>
Mon, 20 May 2013 21:01:46 +0000 (23:01 +0200)
commitc05fe11c7c3c0d2dce0c66fd6fc95900234805a8
tree6f163ea4a1f5e4426060d9c7c9f829bb177b2478
parentfb221603563fc29c37c6f2792928f6cfe60f8dc7
fixed merging fails
src/spamserv.c