adium/adium

adium/adium/
merge adium-1.6 into default

2013-08-06, Frank Dowsett
b4b45a4ae764