Merge branch 'v5-stable' into v5-stable-newstats
authorRainer Gerhards <rgerhards@adiscon.com>
Sat, 7 Apr 2012 12:42:54 +0000 (14:42 +0200)
committerRainer Gerhards <rgerhards@adiscon.com>
Sat, 7 Apr 2012 12:42:54 +0000 (14:42 +0200)
commitbd8d972a975ce794dd71c1c8db724991dd4744a0
tree1dcf15151118890be2cc1506426c665bbc138933
parentbfc6f6d599a4723b26708da5fddcc6db5c53fc21
parenteef1701be28f8f8b00134e6c20a8a493d0e69f80
Merge branch 'v5-stable' into v5-stable-newstats

Conflicts:
configure.ac
ChangeLog