From: Larry Hynes <larry@larryhynes.com>
Date: Mon, 9 May 2016 15:45:07 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: 1.3.0~311^2~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5559a4a7b7ff358545a434434a94c3b9e82e0976;p=thirdparty%2Frspamd.git

Merge remote-tracking branch 'upstream/master'

* upstream/master:
  [Fix] Try to handle multiline history in a more sane way
  [Minor] Some output fixes
  [Feature] Add dot commands for lua REPL:
  [Feature] Fix task functions to work without rspamd_config
  [Fix] Fix REPL output
  [Feature] Add the initial version of LUA repl to rspamadm
  [Feature] Distinguish luajit from lua
  [Rework] Import linenoise for line editing
  [Minor] Use shorter keys for replies module
  [Feature] Add replies plugin
---

5559a4a7b7ff358545a434434a94c3b9e82e0976