From: Andrew Lewis <nerf@judo.za.org>
Date: Sat, 30 Nov 2013 23:03:34 +0000 (+0200)
Subject: Fix conflicts
X-Git-Tag: 0.6.7~36^2~3
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=21350713b8b910b71caf1e3c84d19c2a2624bed0;p=rspamd.git

Fix conflicts
---

21350713b8b910b71caf1e3c84d19c2a2624bed0