Commit 49300268 authored by Joerg Bruehe's avatar Joerg Bruehe

Null-merge,

conflict on "configure.in" which is gone from 5.5.
No change.
parents d3ed4440 7048e02a
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment