adium/adium

adium/adium/
Merged adium-1.5.10 into adium-1.6.
adium-1.6
2014-04-23, Thijs Alkemade
a97833ab0faf