adium/adium

Merge.
adium-1.5.8 1.5.8
2013-10-13, Thijs Alkemade
e0467f507718
Merge.
4151ac3a3b1f9847b8d958f1c7d57a345d442266 1.5
64b4f46272118a2d4d721123fbcb9f485913ff35 1.5.1
80cc358134ea0f681484626ec447d8bf3a27692f 1.5.2
c9b03688370c2887d956130319c8da537354d373 1.5.3
5efcd11df6947cf82c763a8024229d5a326d9c56 1.5.4
fc2294917bf61da7cf8c1560db443fe29e2acfb8 1.5.5
90a171a6b0fc033ebeba46112223e20fcee0a004 1.5.6
a40ffe152e617ebb603ce3c6677eef0ce00cb1ad 1.5.7