Diff gnokii-0.6.31-r4 with a gnokii-9999

Thank you!