adium/adium

adium/adium/
Merged adium-1.5.11 into adium-1.6.
adium-1.6
2014-12-16, Thijs Alkemade
9db8b48c8cf6