Merge branch 'v5-stable-newstats' into v5-devel
authorRainer Gerhards <rgerhards@adiscon.com>
Fri, 27 Jan 2012 10:25:59 +0000 (11:25 +0100)
committerRainer Gerhards <rgerhards@adiscon.com>
Fri, 27 Jan 2012 10:25:59 +0000 (11:25 +0100)
Conflicts:
configure.ac

1  2 
ChangeLog
Makefile.am
action.c

diff --cc ChangeLog
Simple merge
diff --cc Makefile.am
Simple merge
diff --cc action.c
Simple merge