Merge branch 'v5-stable-elasticsearch' into v5-devel-tmp
authorRainer Gerhards <rgerhards@adiscon.com>
Tue, 17 Jan 2012 09:48:39 +0000 (10:48 +0100)
committerRainer Gerhards <rgerhards@adiscon.com>
Tue, 17 Jan 2012 09:48:39 +0000 (10:48 +0100)
commit37e4aab1ecc63db2b5e72fd8a5df5e4976ae82c8
tree9db8aec809487aebf97889b801bfeb0c477e824c
parent76c4d6b951453078ab53bf612caf0b8ec9d54bb8
parent9911dacf59e898bae2c8c6619b85348bf54ddc23
Merge branch 'v5-stable-elasticsearch' into v5-devel-tmp

Conflicts:
ChangeLog
configure.ac
doc/manual.html
tools/syslogd.c
ChangeLog
action.c
configure.ac
plugins/imptcp/imptcp.c
tools/syslogd.c