adium/adium

adium/adium/
merge adium-1.6 into default

2014-07-20, Frank Dowsett
fb9288582076