adium/adium

Merged adium-1.6 into default

2012-09-18, Thijs Alkemade
53627217a663
Merged adium-1.6 into default
4151ac3a3b1f9847b8d958f1c7d57a345d442266 1.5
64b4f46272118a2d4d721123fbcb9f485913ff35 1.5.1
8d4ed0d28f89a09c3deb3b4b1952e21cd4a5e563 1.5.2