From: Andrej Zverev <andrej.zverev@gmail.com>
Date: Fri, 17 Jun 2016 10:25:04 +0000 (+0300)
Subject: Merge branch 'master' of https://github.com/andrejzverev/rspamd
X-Git-Tag: 1.3.0~305^2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=refs%2Fpull%2F667%2Fhead;p=rspamd.git

Merge branch 'master' of https://github.com/andrejzverev/rspamd
---

9e6d07fc4dd0a43a130486c7335b3595e059395b