adium/adium

Backout 6efd242bafce. This change should have not been applied to default.

2012-05-16, Thijs Alkemade
24a111d0ddb1
Backout 6efd242bafce. This change should have not been applied to default.
4151ac3a3b1f9847b8d958f1c7d57a345d442266 1.5