From: Larry Hynes <larry@larryhynes.com>
Date: Wed, 4 May 2016 16:43:55 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: 1.3.0~311^2~9
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2610dec749341f0480ed7a1ce6ecd23ce1b51506;p=thirdparty%2Frspamd.git

Merge remote-tracking branch 'upstream/master'

* upstream/master:
  [Feature] Add more domains to redirectors list
  [Doc] Add preliminary FANN documentation
  [Feature] Print userdata using tostring if possible
  [Feature] Improve phishing plugin
  [Feature] Improve levenshtein distance function
  [Fix] Repair optional dependencies
  [Minor] Slighlty reduce PHISHING score
  [Minor] Always return constant number of results from lua redis
  [Minor] Improve string to action function
  [Fix] Do not greylist on rejection
  [Minor] Add whitelist for phishing module
  [Minor fix] Limit PHISHING to one shot
  [Minor] Add redirector's TLD to PHISHING symbol options
---

2610dec749341f0480ed7a1ce6ecd23ce1b51506