From: Anna Stakhova <anna@rspamd.com>
Date: Sat, 7 Jan 2017 23:57:16 +0000 (+0000)
Subject: Merge branch 'master' of https://github.com/AnnaStakhova/rspamd
X-Git-Tag: 1.5.0~410^2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=refs%2Fpull%2F1319%2Fhead;p=rspamd.git

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

5194e9e0eef3e6d96f0dd1429f63fda018a8f8ba