Fixed fd leak where files were unlinked w/o being closed first.
Now encode everything in UTF-8 instead of Latin9 since that's what
is gonna be used afterwards.
Fixed buffer overflow
Applied patch from bug #2737
Applied patch from bug #2756
Added patch from bug #2752
Make declarations in header match implemenations

Fixes #2789
Return nil where pointers are expected

Fixes #2790
Added IMAP annotations support - patch from #2688
Don't strip "comments" by default in headers. This is uterly braindead.
Update ChangeLog
Merge to 2.2.4
Imported Upstream version 2.2.5
Merge tag 'upstream/2.2.5' into debian

Upstream version 2.2.5
Add id-length = 8 under dch section to debian/gbp.conf

Git-Dch: Ignore
Update changelog for 2.2.5-1 release