adium/adium

Merged

2012-06-20, Thijs Alkemade
6535d5c9664e
Merged
4151ac3a3b1f9847b8d958f1c7d57a345d442266 1.5