adium/adium

adium/adium/
Merged adium-1.6 into libotr4.0.0.
libotr4.0.0
2013-12-05, Thijs Alkemade
05c1ab81dc44