doc: legacy parameter description in imjournal slightly wrong
Merge branch 'v7-stable'
implement new ratelimiting mode for imjournal

and make imjournal use it.

The new mode is needed, as imjournal uses journal's timestamp
as message generation time (which otherwise is when the message
entered the system, and the ratelimiter uses this as current
timestamp in order to save performance).

It is debatable if imjournal is doing the right thing here. But
it doesn't feel totally wrong. So let's safe that debate for
later ;)
imjournal fix: put ratelimiter destruction in wrong entry point

No regression, this was in recently written, never-released code.
Merge branch 'v7-stable'
imjournal: rate limiter was destructed too early

Too quick hacking, obviously, one too late, one too early, now
it should fit ;) Thanks to Tomas Heinrich for pointing this out.
prepare for 7.4.1 release
Merge branch 'v7-stable'

Conflicts:
	ChangeLog
	configure.ac
	doc/manual.html
doc: remove duplicate omfile descriptions

always bears the risk that one or another is not maintained when
an update happpens
Merge branch 'v7-stable'
imrelp: switch to newer-style librelp interface

This interface permits us to pass a user-pointer to librelp, which
it will pass back to us on message reception. This is the foundation
for some more advanced features that require access to imrelp's
configration object.
imrelp: add support for impstats
imrelp: support for setting permitted peers (client authentication) added
first commit
removed
Merge remote branch 'upstream/master'
Added support for command line parameters in "binary" config setting of omprog.

- Command line Parameter Support is only available with the new config format, here is a sample:
action(type="omprog" binary="/path/omprog.py --option=value --option2=\"value 2\"")

- Also fixed a seqfault wenn using the new config format and no template parameter was specified.
Updated omprog documentation
doc: add omprog improvement to ChangeLog
doc: imjournal doc correction