adium/adium

adium/adium/
Merged adium-1.5.8 into adium-1.6.
adium-1.6
2013-09-10, Thijs Alkemade
3b5d579f7ab2