adium/adium

adium/adium/
Merged adium-1.5.7 into adium-1.6.
adium-1.6
2013-06-29, Thijs Alkemade
4c09a9c47209