adium/adium

Merged 1.5.10.2 into 1.5.11.
adium-1.5.11
2016-03-11, Thijs Alkemade
5d4a3b9f6d5f
Merged 1.5.10.2 into 1.5.11.
/* libotr headers */
#import <libotr/proto.h>
#import <libotr/context.h>
#import <libotr/message.h>
#import <libotr/privkey.h>