Merge branch 'v5-stable' into v5-stable-newstats
authorRainer Gerhards <rgerhards@adiscon.com>
Sat, 7 Apr 2012 12:33:37 +0000 (14:33 +0200)
committerRainer Gerhards <rgerhards@adiscon.com>
Sat, 7 Apr 2012 12:33:37 +0000 (14:33 +0200)
commitbfc6f6d599a4723b26708da5fddcc6db5c53fc21
tree6a316f837808e735790fced62a46142f4cf6b9e6
parentda2039614ffd93b8fb1ebddf2ed3eb6dc873c1a5
parenta192300aa26484c88aedd306fdb92d7752eee427
Merge branch 'v5-stable' into v5-stable-newstats

Conflicts:
configure.ac
ChangeLog
action.c
configure.ac
runtime/queue.c