adium/adium

adium/adium/
Merged adium-1.5.6 into adium-1.6.
adium-1.6
2013-03-19, Thijs Alkemade
1c6193870d62